treewide: use tags instead of rev, remove unnecessary string interpolation (#473846)

2026-01-15 20:34:42 +00:00
parent ad4deec23f 702acfa0b5
commit 97efcb3037
232 changed files with 266 additions and 267 deletions
@@ -351,20 +351,20 @@ def _update_package(path, target):
        text = _replace_value('hash', sri_hash, text)

    if fetcher == 'fetchFromGitHub':
-        # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";`
+        # in the case of fetchFromGitHub, it's common to see `tag = version;` or `tag = "v${version}";`
        # in which no string value is meant to be substituted. However, we can just overwrite the previous value.
-        regex = '(rev\s+=\s+[^;]*;)'
+        regex = '(tag\s+=\s+[^;]*;)'
        regex = re.compile(regex)
        matches = regex.findall(text)
        n = len(matches)

        if n == 0:
-            raise ValueError("Unable to find rev value for {}.".format(pname))
+            raise ValueError("Unable to find tag value for {}.".format(pname))
        else:
-            # forcefully rewrite rev, incase tagging conventions changed for a release
+            # forcefully rewrite tag, incase tagging conventions changed for a release
            match = matches[0]
-            text = text.replace(match, f'rev = "refs/tags/{prefix}${{version}}";')
-            # incase there's no prefix, just rewrite without interpolation
+            text = text.replace(match, f'tag = "{prefix}${{version}}";')
+            # in case there's no prefix, just rewrite without interpolation
            text = text.replace('"${version}";', 'version;')

    with open(path, 'w') as f:
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "mopidy";
    repo = "mopidy-spotify";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-pM+kqeWYiPXv9DZDBTgwiEwC6Sbqv6uz5vJ5odcixOw=";
  };

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = pname;
    repo = "${pname}-build";
-    rev = "refs/tags/${version}";
+    tag = version;
    fetchSubmodules = true;
    sha256 = "sha256-rIb6tQimwrUj+623IU5zDyKNWsNYYBElLQClOsP+5Dc=";
  };
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication {
  src = fetchFromGitHub {
    owner = "Groestlcoin";
    repo = "electrum-grs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    sha256 = "1k078jg3bw4n3kcxy917m30x1skxm679w8hcw8mlxb94ikrjc66h";
  };

@@ -10,7 +10,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "vmware-labs";
    repo = "distribution-tooling-for-helm";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-/fU56Dw7tvUnby4S78tyH/dasg4n3rb0hMlIkzvrv4M=";
  };

@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
    inherit hash;
    owner = "GNS3";
    repo = "gns3-gui";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
  };

  nativeBuildInputs = [ wrapQtAppsHook ];
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication {
    inherit hash;
    owner = "GNS3";
    repo = "gns3-server";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
  };

  # GNS3 2.3.26 requires a static BusyBox for the Docker integration
@@ -1,6 +1,6 @@
 { fetchgit, ... }:
 fetchgit {
  url = "https://gerrit.libreoffice.org/help";
-  rev = "refs/tags/cp-25.04.1-1";
+  tag = "cp-25.04.1-1";
  hash = "sha256-jKcrkvdxpebCTeILrjA7bKfcsWw8VFjS7eimJI1dgFQ=";
 }
@@ -1,7 +1,7 @@
 { fetchgit, ... }:
 fetchgit {
  url = "https://gerrit.libreoffice.org/core";
-  rev = "refs/tags/cp-25.04.1-1";
+  tag = "cp-25.04.1-1";
  hash = "sha256-WhNNKL1RC0hWi21wH5EJRZ8V8U7jk6z8h3E3mVR56zk=";
  fetchSubmodules = false;
 }
@@ -1,6 +1,6 @@
 { fetchgit, ... }:
 fetchgit {
  url = "https://gerrit.libreoffice.org/translations";
-  rev = "refs/tags/cp-25.04.1-1";
+  tag = "cp-25.04.1-1";
  hash = "sha256-kZ5LwhEMWYv9peYPjTL14wjYv4LHUMtaM7XGYSVw68U=";
 }
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "FiniteSingularity";
    repo = "obs-advanced-masks";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-NtmOWKk3eZeRa3TvclZpg4sj8lbOoY8hUhxs1z6kEW4=";
  };

@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "wimpysworld";
    repo = "obs-dvd-screensaver";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-eUfy3m0r/sLrGLbp3en1ofcVVWZ+t2rZ4knjwfrorhw=";
  };
  strictDeps = true;
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "exeldro";
    repo = "obs-media-controls";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-r9fqpg0G9rzGSqq5FUS8ul58rj0796aGZIND8PCJ9jk=";
  };

@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "exeldro";
    repo = "obs-recursion-effect";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-PeWJy423QbX4NULuS15LJ/IR/W+tXCJD9TjZdJOGk6A=";
  };

@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "norihiro";
    repo = "obs-vnc";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-bveTfyhHH7RAM24Lp0mWlt52ao9Rn6vCuKjfQH+B8Rw=";
  };

@@ -91,7 +91,7 @@ let
      "debian/PkKek-1-*.pem"
      "debian/patches/OvmfPkg-X64-add-opt-org.tianocore-UninstallMemAttrPr.patch"
    ];
-    rev = "refs/tags/debian/2025.02-8";
+    tag = "debian/2025.02-8";
    hash = "sha256-n/6T5UBwW8U49mYhITRZRgy2tNdipeU4ZgGGDu9OTkg=";
  };

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
    domain = "gitea.ladish.org";
    owner = "LADI";
    repo = "a2jmidid";
-    rev = "refs/tags/${version}";
+    tag = version;
    fetchSubmodules = true;
    hash = "sha256-PZKGhHmPMf0AucPruOLB9DniM5A3BKdghFCrd5pTzeM=";
  };
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
    domain = "gitlab.gnome.org";
    owner = "World";
    repo = "AbiWord";
-    rev = "refs/tags/release-${version}";
+    tag = "release-${version}";
    hash = "sha256-dYbJ726Zuxs7+VTTCWHYQLsVZ/86hRUBQRac6toO4UI=";
  };

@@ -71,7 +71,7 @@ let
  airflow-src = fetchFromGitHub {
    owner = "apache";
    repo = "airflow";
-    rev = "refs/tags/${version}";
+    tag = version;
    # Download using the git protocol rather than using tarballs, because the
    # GitHub archive tarballs don't appear to include tests
    forceFetchGit = true;
@@ -19,7 +19,7 @@ let
    src = fetchFromGitHub {
      owner = "Electrostatics";
      repo = "fetk";
-      rev = "refs/tags/${finalAttrs.version}";
+      tag = finalAttrs.version;
      hash = "sha256-uFA1JRR05cNcUGaJj9IyGNONB2hU9IOBPzOj/HucNH4=";
    };

@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "Electrostatics";
    repo = "apbs";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-2DnHU9hMDl4OJBaTtcRiB+6R7gAeFcuOUy7aI63A3gQ=";
  };

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
    # use pname here because the final jar uses this as the filename
    name = pname;
    url = "https://android.googlesource.com/platform/tools/apksig";
-    rev = "refs/tags/android-15.0.0_r30";
+    tag = "android-15.0.0_r30";
    hash = "sha256-f/PggxvBv8nYUyL9Ukd4YVpunpRWbLL5UYsYhsiDWRE=";
  };

@@ -26,7 +26,7 @@ let
    owner = "World";
    repo = "apostrophe";
    domain = "gitlab.gnome.org";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-Sj5Y4QPMYavdXbU+iVv76qOFNhgBjAeX9+/TvQHZzeI=";
  };

@@ -36,7 +36,7 @@ let

    # keep in sync with upstream shipped version
    # in build-aux/flatpak/org.gnome.gitlab.somas.Apostrophe.json
-    rev = "refs/tags/5.1.0";
+    tag = "5.1.0";
    hash = "sha256-L6KVBw20K67lHT07Ws+ZC2DwdURahqyuyjAaK0kTgN0=";
  };
 in
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitLab {
    owner = "esr";
    repo = "ascii";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-TE9YR5Va9tXaf2ZyNxz7d8lZRTgnD4Lz7FyqRDl1HNY=";
  };

@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "awslabs";
    repo = "aws-shell";
-    rev = "refs/tags/${version}";
+    tag = version;
    hash = "sha256-m96XaaFDFQaD2YPjw8D1sGJ5lex4Is4LQ5RhGzVPvH4=";
  };

@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "jpt";
    repo = "barlow";
-    tag = "${version}";
+    tag = version;
    hash = "sha256-FG68o6qN/296RhSNDHFXYXbkhlXSZJgGhVjzlJqsksY=";
  };

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "BRL-CAD";
    repo = "brlcad";
-    rev = "refs/tags/rel-${lib.replaceStrings [ "." ] [ "-" ] version}";
+    tag = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}";
    hash = "sha256-23UTeH4gY2x/QGYZ64glAkf6LmsXBAppIOHgoUdxgpo=";
  };

@@ -16,7 +16,7 @@ buildGoModule {
  src = fetchFromGitHub {
    owner = "buildpacks";
    repo = "pack";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-QCN0UvWa5u9XX5LvY3yD8Xz2s1XzZUg/WXnAfWwZnY0=";
  };

@@ -10,7 +10,7 @@ let
  blake3-src = fetchFromGitHub {
    owner = "BLAKE3-team";
    repo = "BLAKE3";
-    rev = "refs/tags/1.5.1";
+    tag = "1.5.1";
    hash = "sha256-STWAnJjKrtb2Xyj6i1ACwxX/gTkQo5jUHilcqcgJYxc=";
  };
 in
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitHub {
    owner = "xzfc";
    repo = "cached-nix-shell";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-LI/hecqeRg3eCzU2bASJA8VoG4nvrSeHSeaGYn7M/UI=";
  };

@@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec {
  src = fetchFromGitLab {
    owner = "yaal";
    repo = "canaille";
-    rev = "refs/tags/${version}";
+    tag = version;
    hash = "sha256-FL02ADM7rUU43XR71UWr4FLr/NeUau7zRwTMOSFm1T4=";
  };

@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  src = fetchFromGitHub {
    owner = "lighttigerXIV";
    repo = "catppuccinifier";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-e8sLYp+0YhC/vAn4vag9UUaw3VYDRERGnLD1RuW1TXE=";
  };

@@ -153,7 +153,7 @@ let
    src = fetchFromGitHub {
      owner = "facebook";
      repo = "rocksdb";
-      rev = "refs/tags/v7.9.2";
+      tag = "v7.9.2";
      hash = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM=";
    };
  };
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitLab {
    owner = "zelikos";
    repo = "rollit";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-25+/TvTba/QF7+QE8+O7u4yc9BNi0pcZeNj11dGkEfg=";
  };

@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
  src = fetchFromGitHub {
    owner = "jturcotte";
    repo = "chiptrack";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-yQP5hFM5qBWdaF192PBvM4il6qpmlgUCeuwDCiw/LaQ=";
  };

@@ -75,7 +75,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
          owner = "rust-skia";
          repo = "skia";
          # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
-          rev = "refs/tags/m129-0.77.1";
+          tag = "m129-0.77.1";
          hash = "sha256-WRVuQpfRnYrE7KGFRFx66fXtMFmtJbC3xUcRPK1JoOM=";
        };
        # The externals for skia are taken from skia/DEPS
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "rypervenche";
    repo = "cns11643-fonts";
-    rev = "refs/tags/${version}";
+    tag = version;
    hash = "sha256-A/4iwNvyzOYEpBzxKeq1xM/6aU6EOCATAr0lQlyckKQ=";
  };

@@ -24,7 +24,7 @@ let
    src = fetchFromGitHub {
      owner = "mzabani";
      repo = "codd";
-      rev = "refs/tags/v${version}";
+      tag = "v${version}";
      hash = "sha256-KdZCL09TERy/PolQyYYykEbPtG5yhxrLZSSo9n6p2WE=";
    };

@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitHub {
    owner = "KeisukeYamashita";
    repo = "commitlint-rs";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-rNCMvIVJ/aOTNMyAmwX3Ir6IjHf6wxZ1XlGIWp7omkQ=";
  };

@@ -13,7 +13,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "conduktor";
    repo = "ctl";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-zaguB4LLkzXlMQCEVOWkUUsEovU53F0B51w3BnVjre8=";
  };

@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "create-dmg";
    repo = "create-dmg";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-oWrQT9nuFcJRwwXd5q4IqhG7M77aaazBG0+JSHAzPvw=";
  };

@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "cern-fts";
    repo = "davix";
-    rev = "refs/tags/R_${lib.replaceStrings [ "." ] [ "_" ] version}";
+    tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}";
    hash = "sha256-n4NeHBgQwGwgHAFQzPc3oEP9k3F/sqrTmkI/zHW+Miw=";
  };

@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "pkuvcl";
    repo = "davs2";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-SUY3arrVsFecMcbpmQP0+4rtcSRfQc6pzxZDcEuMWPU=";
  };

@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
    domain = "salsa.debian.org";
    owner = "installer-team";
    repo = "debootstrap";
-    rev = "refs/tags/${version}";
+    tag = version;
    hash = "sha256-4vINaMRo6IrZ6e2/DAJ06ODy2BWm4COR1JDSY52upUc=";
  };

@@ -12,7 +12,7 @@ buildNpmPackage rec {
  src = fetchFromGitHub {
    owner = "kepano";
    repo = "defuddle-cli";
-    tag = "${version}";
+    tag = version;
    hash = "sha256-28XmpFKzBKNhRkPOGaacJVw8hjQUZq2nwuR0vNo8aW0=";
  };

@@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
  src = fetchFromGitHub {
    owner = "timo-reymann";
    repo = "deterministic-zip";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-rvheo/DkQTfpVy8fVRRwRA4G9mdMNArptxNT0sxdqnc=";
  };

@@ -13,7 +13,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "dlvhdr";
    repo = "diffnav";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-QDPH7vBoA4YCmC+CLmeBdspwOhFEV3iSiyBYX6lwOLA=";
  };

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "slusarz";
    repo = "dovecot-fts-flatcurve";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-96sR/pl0G0sSjh/YrXdgVgASJPhrL32xHCbBGrDxzoU=";
  };

@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromBitbucket {
    owner = "ecwolf";
    repo = "ecwolf";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-T5K6B2fWMKMLB/662p/YLEv0Od9n0vUakznyoOnr0kI=";
  };

@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitLab {
    owner = "entangle";
    repo = "entangle";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
    sha256 = "hz2WSDOjriQSavFlDT+35x1X5MeInq80ZrSP1WR/td0=";
  };

@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "Equicord";
    repo = "Equicord";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-ce5n7E+eJLPnj/dUnaaDi4R8kKO4+iOcQgdtOin4NcM=";
  };

@@ -19,7 +19,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "esphome";
    repo = "dashboard";
-    rev = "refs/tags/${version}";
+    tag = version;
    hash = "sha256-PZf9YLtHqeR+5BRVv1yOMVt6NVlbJTj98ukGnO0RV0Q=";
  };

@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitLab {
    owner = "etherlab.org";
    repo = "ethercat";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-yIlaAjPNcA7yIiCe+2kwk5IHIkwUv8bTxK0H3hu91MI=";
  };

@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitLab {
    owner = "eztrace";
    repo = "eztrace";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-ccW4YjEf++tkdIJLze2x8B/SWbBBXnYt8UV9OH8+KGU=";
  };

@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "mariuz";
    repo = "flamerobin";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-IwJEFF3vP0BC9PoMoY+XPLT+ygXnFXP/TWaqjdQWs8s=";
  };

@@ -41,7 +41,7 @@ let
    src = fetchFromGitLab {
      owner = "flightgear";
      repo = "fgdata";
-      tag = "${version}";
+      tag = version;
      hash = "sha256-LNHO/W8p4b8fYcehdfVecldKQ9uJp1zlg60xdgDC45c=";
    };

@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitLab {
    owner = "flightgear";
    repo = "flightgear";
-    tag = "${version}";
+    tag = version;
    hash = "sha256-m4bbWwMXwKJrMkb6svGrIZhcsPghrTMgFs8JCx3Wn/A=";
  };

@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
  src = fetchFromSourcehut {
    owner = "~technomancy";
    repo = "fnlfmt";
-    rev = "refs/tags/${version}";
-    hash = "sha256-LYHhKC8iA4N8DdCH8GfSOkN/e+W3YjkFhVSDQraKoFk=";
+    tag = version;
+    hash = "sha256-wbeWAv4xhxh7M6tRd9qpgBRtg1/fqg0AUPvh2M5f60Q=";
  };

  nativeBuildInputs = [ luaPackages.fennel ];
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
    "PREFIX=$(out)"
    "FENNEL=${luaPackages.fennel}/bin/fennel"
  ];
-  sourceRoot = [ "${src.name}/tags/${version}" ];

  doInstallCheck = true;
  installCheckPhase = ''
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitLab {
    owner = "adhami3310";
    repo = "Footage";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-VEL96JrJ5eJEoX2miiB4dqGUXizNlYWCUZkkYkh09B8=";
  };

@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
    domain = "gitlab.freedesktop.org";
    owner = "libfprint";
    repo = "fprintd";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-aGIz50S0zfE3rV6QJp8iQz3uUVn8WAL68KU70j8GyOU=";
  };

@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "erdnaxe";
    repo = "galene-stream";
-    tag = "${version}";
+    tag = version;
    hash = "sha256-3TdU3vBVuFle+jon2oJLa/rTLIiwYkvzscTDbMEXD1Q=";
  };

@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
    domain = "gitlab.freedesktop.org";
    owner = "geoclue";
    repo = "geoclue";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-LwL1WtCdHb/NwPr3/OLISwaAwplhJwiZT9vUdX29Bbs=";
  };

@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "linas";
    repo = "glextrusion";
-    rev = "refs/tags/${pname}-${version}";
+    tag = "${pname}-${version}";
    sha256 = "sha256-yvCu0EOwxOMN6upeHX+C2sIz1YVjjB/320g+Mf24S6g=";
  };

@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  src = fetchFromGitHub {
    owner = "kruseio";
    repo = "hygg";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-wxgHlRqe/g9LppWWTzft9hTA8heuFvGkKvA7nG2PsxA=";
  };

@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitHub {
    owner = "greshake";
    repo = "i3status-rust";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-Eam0MDACJN/a8J1Za7Xwy0Jlv/KGNn4M13C2yaCgLnU=";
  };

@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  src = fetchFromGitHub {
    owner = "mikhail-m1";
    repo = "illuminanced";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-ZEVma0uj9rsWB+vfUL7w3dHxI/ppBCG23TirGE+RREk=";
  };

@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
    domain = "gitlab.freedesktop.org";
    owner = "drm";
    repo = "igt-gpu-tools";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-Lt/mqx13nHyD5QiDl8oWGiYIiK006uQvbbzHH44LB/0=";
  };

@@ -14,7 +14,7 @@ buildGoModule {
  src = fetchFromGitLab {
    owner = "gaincoder";
    repo = "invidious-router";
-    rev = "refs/tags/${version}";
+    tag = version;
    hash = "sha256-YcMtZq4VMHr6XqHcsAAEmMF6jF1j1wb7Lq4EK42QAEo=";
  };

@@ -11,7 +11,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = pname;
    repo = "cli";
-    rev = "refs/tags/${pname}-${version}";
+    tag = "${pname}-${version}";
    hash = "sha256-sdQdCP2NotrdeqYrSd9c6sExFeuX54I4fxJfEyULPuk=";
  };

@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
    domain = "codeberg.org";
    owner = "baarkerlounger";
    repo = "jogger";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-bju9XXMT6HRHG9QViO+FQCYQ+llrC+GP/AlIha0mxkM=";
  };

@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "just-buildsystem";
    repo = "justbuild";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-ZTwe6S0AH1yQt5mABtIeWuMbiVSKeOZWMFI26fthLsM=";
  };

@@ -17,7 +17,7 @@ let
    src = fetchFromGitHub {
      owner = "influxdata";
      repo = "flux";
-      rev = "refs/tags/v${libflux_version}";
+      tag = "v${libflux_version}";
      hash = "sha256-v9MUR+PcxAus91FiHYrMN9MbNOTWewh7MT6/t/QWQcM=";
    };
    patches = [
@@ -73,7 +73,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "influxdata";
    repo = "kapacitor";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-vxaLfJq0NFAJst0/AEhNJUl9dAaZY3blZAFthseMSX0=";
  };

@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
    domain = "lily-is.land";
    owner = "kazv";
    repo = "kazv";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-WBS7TJJw0t57V4+NxsG8V8q4UKQXB8kRpWocvNy1Eto=";
  };

@@ -12,7 +12,7 @@ buildGoModule (finalAttrs: {
  src = fetchFromGitHub {
    owner = "komari-monitor";
    repo = "komari-agent";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-aWCsaiYkpj0D9hr7V3pxSk14pMD2E117vwemt9Ckqv0=";
  };

@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication {
    owner = "teixeira0xfffff";
    repo = "KoodousFinder";
    # Not properly tagged, https://github.com/teixeira0xfffff/KoodousFinder/issues/7
-    #rev = "refs/tags/v${version}";
+    #tag = "v${version}";
    rev = "d9dab5572f44e5cd45c04e6fcda38956897855d1";
    hash = "sha256-skCbt2lDKgSyZdHY3WImbr6CF0icrDPTIXNV1736gKk=";
  };
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitLab {
    owner = "mcfrith";
    repo = "last";
-    rev = "refs/tags/${version}";
+    tag = version;
    hash = "sha256-U1FGP6jzB36HLwTFKm/VMZWPPjo6mVuV/ePhGIkQgpg=";
  };

@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitLab {
    owner = "inkscape";
    repo = "lib2geom";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-kbcnefzNhUj/ZKZaB9r19bpI68vxUKOLVAwUXSr/zz0=";
  };

@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
    domain = "lily-is.land";
    owner = "kazv";
    repo = "libkazv";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-bKujiuAR5otF7nc/BdVWVaEW9fSxdh2bcAgsQ5UO1Aw=";
  };

@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "loot";
    repo = "libloot";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-l8AdqJ0lZH4rBcf4WV3ju+sIHYam6USXCXTqyRPzgeo=";
  };

@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
    domain = "gitlab.freedesktop.org";
    owner = "vyivel";
    repo = "libsfdo";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-xT1pKKElwKSd43XTKuBY+9rogquV1IAAYgWV5lEpAHk=";
  };

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "RTimothyEdwards";
    repo = "magic";
-    tag = "${version}";
+    tag = version;
    sha256 = "sha256-P5qfMsn3DGHjeF7zsZWeG9j38C6j5UEwUqGyjaEVO1E=";
    leaveDotGit = true;
  };
@@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "matrix-org";
    repo = "synapse-s3-storage-provider";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-aeacw6Fpv4zFhZI4LdsJiV2pcOAMv3aV5CicnwYRxw8=";
  };

@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitLab {
    owner = "meritous";
    repo = "meritous";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-6KK2anjX+fPsYf4HSOHQ0EQBINqZiVbxo1RmBR6pslg=";
  };

@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "primesearch";
    repo = "mfaktc";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    fetchSubmodules = true;
    hash = "sha256-7lJ3+v9exe+n+Txkn1vsvSPYLEP4l/0UgHpc6lAGv1Y=";
  };
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
    domain = "codeberg.org";
    owner = "mlmmj";
    repo = "mlmmj";
-    rev = "refs/tags/RELEASE_" + lib.replaceStrings [ "." ] [ "_" ] version;
+    tag = "RELEASE_" + lib.replaceStrings [ "." ] [ "_" ] version;
    hash = "sha256-kAo04onxVve3kCaM4h1APsjs3C4iePabkBFJeqvnPxo=";
  };

@@ -16,7 +16,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "mov-cli";
    repo = "mov-cli-test";
-    rev = "refs/tags/${version}";
+    tag = version;
    hash = "sha256-INdPAJxPxfo5bKg4Xn1r7bildxznXrTJxmDI21wylnI=";
  };

@@ -20,7 +20,7 @@ let
    src = fetchFromGitHub {
      owner = "murat-dogan";
      repo = "node-datachannel";
-      rev = "refs/tags/v${nodeDatachannel.version}";
+      tag = "v${nodeDatachannel.version}";
      hash = "sha256-r5tBg645ikIWm+RU7Muw/JYyd7AMpkImD0Xygtm1MUk=";
    };

@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "nbfc-linux";
    repo = "nbfc-linux";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-ARUhm1K3A0bzVRen6VO3KvomkPl1S7vx2+tmg2ZtL8s=";
  };

@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "Mic92";
    repo = "nix-fast-build";
-    rev = "refs/tags/${version}";
+    tag = version;
    hash = "sha256-6X4BW+3C2nfkorMfe+tuoeYrdddxPtLqOJ1rZxuxPrc=";
  };

@@ -12,7 +12,7 @@ buildGoModule rec {
    domain = "codeberg.org";
    owner = "thefederationinfo";
    repo = "nodeinfo-go";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-XwK3QeVDQMZD5G79XPJTAJyilVgYFVgZORHYTBI0gIQ=";
  };

@@ -11,7 +11,7 @@ buildNpmPackage rec {
  src = fetchFromGitHub {
    owner = "raineorshine";
    repo = "npm-check-updates";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-I9X98vqQgLgWt7q9Tr+0b+IlpTsPZDBQd+PVZlgpzyE=";
  };

@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromBitbucket {
    owner = "alekseyt";
    repo = "nunicode";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-6255YdX7eYSAj0EAE4RgX1m4XDNIF/Nc4ZCvXzTxpag=";
  };

@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "owncloud";
    repo = "web";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-hupdtK/V74+X7/eXoDmUjFvSKuhnoOtNQz7o6TLJXG4=";
  };

@@ -513,7 +513,7 @@ in
    src = fetchFromGitHub {
      owner = "jneilliii";
      repo = "OctoPrint-STLViewer";
-      rev = "refs/tags/${version}";
+      tag = version;
      sha256 = "sha256-S7zjEbyo59OJpa7INCv1o4ybQ+Sy6a3EJ5AJ6wiBe1Y=";
    };

@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  src = fetchFromGitHub {
    owner = "eero-lehtinen";
    repo = "oklch-color-picker";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-dbsE1mYt/GhpkWIBS6MejiKKKz1B+h/3wqGKHCp0p2Q=";
  };

@@ -11,7 +11,7 @@ let
        version = "23.1.2";
        build-system = [ super.poetry-core ];
        src = oldAttrs.src.override {
-          rev = "refs/tags/v${version}";
+          tag = "v${version}";
          hash = "sha256-YO4Clbo5fmXbysxwwM2qCHJwO5KwDC05VctRVFruJcw=";
        };
      });
@@ -27,7 +27,7 @@ python.pkgs.buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "bentoml";
    repo = "openllm";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-4KIpe6KjbBDDUj0IjzSccxjgZyBoaUVIQJYk1+W01Vo=";
  };

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "orocos";
    repo = "orocos_kinematics_dynamics";
-    tag = "${version}";
+    tag = version;
    hash = "sha256-4pPU+6uMMYLGq2V46wmg6lHFVhwFXrEg7PfnWGAI2is=";
    fetchSubmodules = true; # Needed to build Python bindings
  };
@@ -12,7 +12,7 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "home-assistant";
    repo = "os-agent";
-    tag = "${version}";
+    tag = version;
    hash = "sha256-x0bVY476Gm5D1drRmyszdshrO0Vi/baDsG3ulysu0Kg=";
  };

@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
    domain = "codeberg.org";
    owner = "outfly";
    repo = "outfly";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-FRvu3FgbT3i5888ll573nhb7naYx04Oi8nrcfgEHxUo=";
  };

@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitHub {
    owner = "zed-industries";
    repo = "package-version-server";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-/YyJ8+tKrNKVrN+F/oHgtExBBRatIIOvWr9mAyTHA3E=";
  };

@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "michaelstepner";
    repo = "pandoc-mustache";
-    tag = "${version}";
+    tag = version;
    hash = "sha256-lgbQV4X2N4VuIEtjeSA542yqGdIs5QQ7+bdCoy/aloE=";
  };

@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "lxde";
    repo = "pcmanfm";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-4kJDCnld//Vbe2KbrLoYZJ/dutagY/GImoOnbpQIdDY=";
  };

@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
    domain = "salsa.debian.org";
    owner = "rousseau";
    repo = "PCSC";
-    rev = "refs/tags/${finalAttrs.version}";
+    tag = finalAttrs.version;
    hash = "sha256-37qeWGEuutF0cOOidoLchKJLQCvJFdVRZXepWzD4pZs=";
  };

@@ -17,7 +17,7 @@ let
    src = fetchFromGitHub {
      owner = "biobakery";
      repo = "phylophlan";
-      rev = "refs/tags/${finalAttrs.version}";
+      tag = finalAttrs.version;
      hash = "sha256-KlWKt2tH2lQBh/eQ2Hbcu2gXHEFfmFEc6LrybluxINc=";
    };

--- a/Show More
+++ b/Show More