From c6e75196c77b1bc6280298a1f45531cc676c28fc Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Fri, 6 Feb 2026 23:43:16 +0100
Subject: [PATCH 01/50] requireFile: use lib.extendMkDerivation

---
 .../trivial-builders/default.nix              | 144 +++++++++++-------
 1 file changed, 85 insertions(+), 59 deletions(-)

diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index b350d51455cd..00fc2b6e275d 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -907,67 +907,93 @@ rec {
 
   # Docs in doc/build-helpers/fetchers.chapter.md
   # See https://nixos.org/manual/nixpkgs/unstable/#requirefile
-  requireFile =
-    {
-      name ? null,
-      sha256 ? null,
-      sha1 ? null,
-      hash ? null,
-      url ? null,
-      message ? null,
-      hashMode ? "flat",
-    }:
-    assert (message != null) || (url != null);
-    assert (sha256 != null) || (sha1 != null) || (hash != null);
-    assert (name != null) || (url != null);
-    let
-      msg =
-        if message != null then
-          message
-        else
-          ''
-            Unfortunately, we cannot download file ${name_} automatically.
-            Please go to ${url} to download it yourself, and add it to the Nix store
-            using either
-              nix-store --add-fixed ${hashAlgo} ${name_}
-            or
-              nix-prefetch-url --type ${hashAlgo} file:///path/to/${name_}
-          '';
-      hashAlgo =
-        if hash != null then
-          (builtins.head (lib.strings.splitString "-" hash))
-        else if sha256 != null then
-          "sha256"
-        else
-          "sha1";
-      hashAlgo_ = if hash != null then "" else hashAlgo;
-      hash_ =
-        if hash != null then
-          hash
-        else if sha256 != null then
-          sha256
-        else
-          sha1;
-      name_ = if name == null then baseNameOf (toString url) else name;
-    in
-    stdenvNoCC.mkDerivation {
-      name = name_;
-      outputHashMode = hashMode;
-      outputHashAlgo = hashAlgo_;
-      outputHash = hash_;
-      preferLocalBuild = true;
-      builder = writeScript "restrict-message" ''
-        source ${stdenvNoCC}/setup
-        cat <<_EOF_
+  requireFile = lib.extendMkDerivation {
+    constructDrv = stdenv.mkDerivation;
 
-        ***
-        ${msg}
-        ***
+    excludeDrvArgNames = [
+      "hash"
+      "hashMode"
+      "message"
+      "sha1"
+      "sha256"
+      "url"
+    ];
 
-        _EOF_
-        exit 1
-      '';
-    };
+    extendDrvArgs =
+      finalAttrs:
+      {
+        name ? null,
+        sha256 ? null,
+        sha1 ? null,
+        hash ? null,
+        url ? null,
+        message ? null,
+        hashMode ? "flat",
+      }@args:
+      assert (message != null) || (url != null);
+      assert (sha256 != null) || (sha1 != null) || (hash != null);
+      assert (name != null) || (url != null);
+      let
+        msg =
+          if message != null then
+            message
+          else
+            ''
+              Unfortunately, we cannot download file ${name_} automatically.
+              Please go to ${url} to download it yourself, and add it to the Nix store
+              using either
+                nix-store --add-fixed ${hashAlgo} ${name_}
+              or
+                nix-prefetch-url --type ${hashAlgo} file:///path/to/${name_}
+            '';
+        hashAlgo =
+          if hash != null then
+            (builtins.head (lib.strings.splitString "-" hash))
+          else if sha256 != null then
+            "sha256"
+          else
+            "sha1";
+        hashAlgo_ = if hash != null then "" else hashAlgo;
+        hash_ =
+          if hash != null then
+            hash
+          else if sha256 != null then
+            sha256
+          else
+            sha1;
+        name_ = if name == null then baseNameOf (toString url) else name;
+      in
+      {
+        outputHashMode = hashMode;
+        outputHashAlgo = hashAlgo_;
+        outputHash = hash_;
+        preferLocalBuild = true;
+        builder = writeScript "restrict-message" ''
+          source ${stdenvNoCC}/setup
+          cat <<_EOF_
+
+          ***
+          ${msg}
+          ***
+
+          _EOF_
+          exit 1
+        '';
+      }
+      // (lib.optionalAttrs (name == null) {
+        # The case of providing `url`, but not `name`. This has
+        # weird interactions with the positioning system
+
+        # When we set `name` explicitly here, we override where the
+        # position is read from. So we must fix it here.
+        pos = lib.unsafeGetAttrPos "url" args;
+
+        # If a name is not provided, use the basename of the url
+        name = builtins.warn "providing a URL without a name is deprecated" baseNameOf (toString url);
+      });
+
+    inheritFunctionArgs = false;
+  };
 
   # TODO: move copyPathToStore docs to the Nixpkgs manual
   /*

From b021b23f9642283d900375b1b8f836f5c9764629 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 21 Feb 2026 17:53:36 +0800
Subject: [PATCH 02/50] mercury: move to by-name

---
 .../mercury/default.nix => by-name/me/mercury/package.nix}  | 6 +++---
 pkgs/top-level/all-packages.nix                             | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{development/compilers/mercury/default.nix => by-name/me/mercury/package.nix} (95%)

diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/by-name/me/mercury/package.nix
similarity index 95%
rename from pkgs/development/compilers/mercury/default.nix
rename to pkgs/by-name/me/mercury/package.nix
index 9e8cd70bc075..10a1d8b570c0 100644
--- a/pkgs/development/compilers/mercury/default.nix
+++ b/pkgs/by-name/me/mercury/package.nix
@@ -6,7 +6,7 @@
   flex,
   bison,
   texinfo,
-  jdk_headless,
+  openjdk8_headless,
   erlang,
   makeWrapper,
   readline,
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     flex
     bison
     texinfo
-    jdk_headless
+    openjdk8_headless
     erlang
     readline
   ];
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     for e in $(ls $out/bin) ; do
       wrapProgram $out/bin/$e \
         --prefix PATH ":" "${gcc}/bin" \
-        --prefix PATH ":" "${jdk_headless}/bin" \
+        --prefix PATH ":" "${openjdk8_headless}/bin" \
         --prefix PATH ":" "${erlang}/bin"
     done
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1172693508bf..db8615277228 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4580,10 +4580,6 @@ with pkgs;
     mkLLVMPackages
     ;
 
-  mercury = callPackage ../development/compilers/mercury {
-    jdk_headless = openjdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
-  };
-
   mitschemeX11 = mitscheme.override {
     enableX11 = true;
   };

From aec7ec604b6b6bbba36b0012ded742690b6f202d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 24 Feb 2026 18:22:10 +0100
Subject: [PATCH 03/50] lomiri.mediascanner2: 0.118 -> 0.200

---
 .../lomiri/services/mediascanner2/default.nix   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index 56370d078c1d..fa17efbedac3 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mediascanner2";
-  version = "0.118";
+  version = "0.200";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/mediascanner2";
     tag = finalAttrs.version;
-    hash = "sha256-ZJXJNDZUDor5EJ+rn7pQt7lLzoszZUQM3B+u1gBSMs8=";
+    hash = "sha256-tTEbH5gXK+0y3r1LCxsZ6vr1FVyXWZaNAXaR6jcIP0Y=";
   };
 
   outputs = [
@@ -45,7 +45,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace src/qml/MediaScanner.*/CMakeLists.txt \
-      --replace-fail "\''${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}"
+  ''
+  # https://gitlab.com/ubports/development/core/mediascanner2/-/commit/4268b8c0a7e99c1d12f43599b1ae76b5b27572ec
+  # Remove when version > 0.200
+  + ''
+    substituteInPlace src/extractor/CMakeLists.txt src/qml/MediaScanner.0.1/CMakeLists.txt \
+      --replace-fail 'msg(' 'message('
   '';
 
   strictDeps = true;
@@ -82,7 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   checkInputs = [ gtest ];
 
-  cmakeFlags = [ (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) ];
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
+    (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
+  ];
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 

From b75a8c392655b93bfa23902bd01de7b82578188a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2026 13:42:15 +0000
Subject: [PATCH 04/50] ast-grep: 0.40.5 -> 0.41.0

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

diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index acf0467f76ce..09994cf1ebeb 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ast-grep";
-  version = "0.40.5";
+  version = "0.41.0";
 
   src = fetchFromGitHub {
     owner = "ast-grep";
     repo = "ast-grep";
     tag = finalAttrs.version;
-    hash = "sha256-O4f9PjGtwK6poFIbtz26q8q4fiYjfQEtobXmghQZAfw=";
+    hash = "sha256-cL7RtGFhIKTlfP7wEjdjT8uTxB/tG2joob+HN5NG1G8=";
   };
 
   # error: linker `aarch64-linux-gnu-gcc` not found
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm .cargo/config.toml
   '';
 
-  cargoHash = "sha256-N5WrItW/yeZ+GDTw5yFy4eB11BzOlcuePGAefhJaG6I=";
+  cargoHash = "sha256-zPl9fUG+RdddB7r4nWHETHsULf/hDDFpTf8h3xe7UiI=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From f831f8edadf49aa6eac8222e6f7a32d64c4f7ade Mon Sep 17 00:00:00 2001
From: robert jakub <rj@project2.pl>
Date: Mon, 2 Mar 2026 15:43:43 +0100
Subject: [PATCH 05/50] python31{3,4}.pkgs.meshcore: 2.2.5 -> 2.2.8

---
 .../python-modules/meshcore/default.nix       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/meshcore/default.nix b/pkgs/development/python-modules/meshcore/default.nix
index 3a45c35ad729..9d5a7330b5bb 100644
--- a/pkgs/development/python-modules/meshcore/default.nix
+++ b/pkgs/development/python-modules/meshcore/default.nix
@@ -1,25 +1,24 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-
-  # build-system
+  fetchFromGitHub,
   hatchling,
-
   # dependencies
   bleak,
   pycayennelpp,
-  pyserial-asyncio,
+  pyserial-asyncio-fast,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "meshcore";
-  version = "2.2.5";
+  version = "2.2.8";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-FYGBUKaoOAiDwrJyNW+rrQurEH87lDjP1mW8nKA9HRc=";
+  src = fetchFromGitHub {
+    owner = "meshcore-dev";
+    repo = "meshcore_py";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-S3hyA2TsgEHwB0gv5xFMTbwnAoGbceq0C5+8MBedD70=";
   };
 
   build-system = [ hatchling ];
@@ -27,7 +26,7 @@ buildPythonPackage rec {
   dependencies = [
     bleak
     pycayennelpp
-    pyserial-asyncio
+    pyserial-asyncio-fast
   ];
 
   pythonImportsCheck = [ "meshcore" ];
@@ -35,7 +34,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for communicating with meshcore companion radios";
     homepage = "https://github.com/meshcore-dev/meshcore_py";
+    changelog = "https://github.com/meshcore-dev/meshcore_py/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.haylin ];
+    maintainers = with lib.maintainers; [ haylin ];
   };
-}
+})

From 80366561d0da383177268f595605c41686f09378 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 2 Mar 2026 21:28:29 +0100
Subject: [PATCH 06/50] ocamlPackages.mparser-re: init at 1.3

---
 pkgs/development/ocaml-modules/mparser/re.nix | 19 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/mparser/re.nix

diff --git a/pkgs/development/ocaml-modules/mparser/re.nix b/pkgs/development/ocaml-modules/mparser/re.nix
new file mode 100644
index 000000000000..8e18f2a19528
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mparser/re.nix
@@ -0,0 +1,19 @@
+{
+  buildDunePackage,
+  mparser,
+  re,
+}:
+
+buildDunePackage {
+  pname = "mparser-re";
+  inherit (mparser) src version;
+
+  propagatedBuildInputs = [
+    mparser
+    re
+  ];
+
+  meta = mparser.meta // {
+    description = "MParser plugin: RE-based regular expressions";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 689501fd0c6f..4291d4e63904 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1371,6 +1371,8 @@ let
 
         mparser-pcre = callPackage ../development/ocaml-modules/mparser/pcre.nix { };
 
+        mparser-re = callPackage ../development/ocaml-modules/mparser/re.nix { };
+
         msgpck = callPackage ../development/ocaml-modules/msgpck { };
 
         mrmime = callPackage ../development/ocaml-modules/mrmime { };

From a4382f4b412e47d304adfaf2d64e0f2517c374f8 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 2 Mar 2026 08:07:24 -0600
Subject: [PATCH 07/50] git-annex-metadata-gui: migrate to by-name

---
 .../gi/git-annex-metadata-gui/package.nix}             | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  6 ------
 2 files changed, 4 insertions(+), 12 deletions(-)
 rename pkgs/{applications/version-management/git-annex-metadata-gui/default.nix => by-name/gi/git-annex-metadata-gui/package.nix} (87%)

diff --git a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix b/pkgs/by-name/gi/git-annex-metadata-gui/package.nix
similarity index 87%
rename from pkgs/applications/version-management/git-annex-metadata-gui/default.nix
rename to pkgs/by-name/gi/git-annex-metadata-gui/package.nix
index d92ee4662222..e5ad93ce0e2c 100644
--- a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
+++ b/pkgs/by-name/gi/git-annex-metadata-gui/package.nix
@@ -1,13 +1,11 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  pyqt5,
   qt5,
-  git-annex-adapter,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "git-annex-metadata-gui";
   version = "0.2.0";
   format = "setuptools";
@@ -30,8 +28,8 @@ buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = [
-    pyqt5
-    git-annex-adapter
+    python3Packages.pyqt5
+    python3Packages.git-annex-adapter
   ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7dd32a0c162..ec1ab7b3f31b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1123,12 +1123,6 @@ with pkgs;
 
   github-cli = gh;
 
-  git-annex-metadata-gui =
-    libsForQt5.callPackage ../applications/version-management/git-annex-metadata-gui
-      {
-        inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;
-      };
-
   git-annex-remote-dbx = callPackage ../applications/version-management/git-annex-remote-dbx {
     inherit (python3Packages)
       buildPythonApplication

From 9ba2d6a74bba15dadd4bb86ed5d4806c74adced1 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 2 Mar 2026 08:11:01 -0600
Subject: [PATCH 08/50] git-annex-metadata-gui: modernize derivation, switch to
 PEP517

---
 .../gi/git-annex-metadata-gui/package.nix        | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/gi/git-annex-metadata-gui/package.nix b/pkgs/by-name/gi/git-annex-metadata-gui/package.nix
index e5ad93ce0e2c..084377bb1819 100644
--- a/pkgs/by-name/gi/git-annex-metadata-gui/package.nix
+++ b/pkgs/by-name/gi/git-annex-metadata-gui/package.nix
@@ -5,16 +5,16 @@
   qt5,
 }:
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "git-annex-metadata-gui";
   version = "0.2.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "alpernebbi";
     repo = "git-annex-metadata-gui";
-    rev = "v${version}";
-    sha256 = "03kch67k0q9lcs817906g864wwabkn208aiqvbiyqp1qbg99skam";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VU2d0ls4XOzj2jgqBISdS3FODHoGpBOQZjRhMI+BbA4=";
   };
 
   prePatch = ''
@@ -27,7 +27,11 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
-  propagatedBuildInputs = [
+  build-system = [
+    python3Packages.setuptools
+  ];
+
+  dependencies = [
     python3Packages.pyqt5
     python3Packages.git-annex-adapter
   ];
@@ -43,4 +47,4 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.gpl3Plus;
     platforms = with lib.platforms; linux;
   };
-}
+})

From 568c11e3a1086be8d377f1ead8b20661a483468e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 3 Mar 2026 09:41:07 -0600
Subject: [PATCH 09/50] sssd: migrate to by-name

---
 .../linux => by-name/ss}/sssd/fix-kerberos-version.patch     | 0
 .../linux/sssd/default.nix => by-name/ss/sssd/package.nix}   | 4 +++-
 pkgs/top-level/all-packages.nix                              | 5 -----
 3 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{os-specific/linux => by-name/ss}/sssd/fix-kerberos-version.patch (100%)
 rename pkgs/{os-specific/linux/sssd/default.nix => by-name/ss/sssd/package.nix} (97%)

diff --git a/pkgs/os-specific/linux/sssd/fix-kerberos-version.patch b/pkgs/by-name/ss/sssd/fix-kerberos-version.patch
similarity index 100%
rename from pkgs/os-specific/linux/sssd/fix-kerberos-version.patch
rename to pkgs/by-name/ss/sssd/fix-kerberos-version.patch
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/by-name/ss/sssd/package.nix
similarity index 97%
rename from pkgs/os-specific/linux/sssd/default.nix
rename to pkgs/by-name/ss/sssd/package.nix
index fa7ddbd97817..8a4acc859ec4 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/by-name/ss/sssd/package.nix
@@ -46,7 +46,7 @@
   p11-kit,
   nss_wrapper,
   ncurses,
-  Po4a,
+  perlPackages,
   jansson,
   jose,
   docbook_xsl,
@@ -60,6 +60,8 @@
 
 let
   docbookFiles = "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
+  # NOTE: freeipa and sssd need to be built with the same version of python
+  inherit (perlPackages) Po4a;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sssd";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7dd32a0c162..8e1cbd4ffd8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3568,11 +3568,6 @@ with pkgs;
     libsForQt5.callPackage ../tools/networking/globalprotect-openconnect
       { };
 
-  sssd = callPackage ../os-specific/linux/sssd {
-    # NOTE: freeipa and sssd need to be built with the same version of python
-    inherit (perlPackages) Po4a;
-  };
-
   buildWasmBindgenCli = callPackage ../build-support/wasm-bindgen-cli { };
 
   woodpecker-agent = callPackage ../development/tools/continuous-integration/woodpecker/agent.nix { };

From f33349ad68e25eda6a15bf2a68b56302ad331f2c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 3 Mar 2026 09:47:59 -0600
Subject: [PATCH 10/50] freeipa: migrate to by-name

---
 .../default.nix => by-name/fr/freeipa/package.nix} | 14 +++++++++++---
 pkgs/top-level/all-packages.nix                    | 11 -----------
 2 files changed, 11 insertions(+), 14 deletions(-)
 rename pkgs/{os-specific/linux/freeipa/default.nix => by-name/fr/freeipa/package.nix} (94%)

diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/by-name/fr/freeipa/package.nix
similarity index 94%
rename from pkgs/os-specific/linux/freeipa/default.nix
rename to pkgs/by-name/fr/freeipa/package.nix
index d6a25e26aa24..fa66da6d8212 100644
--- a/pkgs/os-specific/linux/freeipa/default.nix
+++ b/pkgs/by-name/fr/freeipa/package.nix
@@ -6,10 +6,10 @@
   pkg-config,
   autoconf,
   automake,
-  kerberos,
+  krb5,
   openldap,
   popt,
-  sasl,
+  cyrus_sasl,
   curl,
   xmlrpc_c,
   ding-libs,
@@ -22,7 +22,7 @@
   libuuid,
   talloc,
   tevent,
-  samba,
+  samba4,
   libunistring,
   libverto,
   libpwquality,
@@ -64,6 +64,14 @@ let
     samba
     ifaddr
   ];
+  # NOTE: freeipa and sssd need to be built with the same version of python
+  kerberos = krb5.override {
+    withVerto = true;
+  };
+  sasl = cyrus_sasl;
+  samba = samba4.override {
+    enableLDAP = true;
+  };
 in
 stdenv.mkDerivation rec {
   pname = "freeipa";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e1cbd4ffd8f..3b83791cffa5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6362,17 +6362,6 @@ with pkgs;
 
   fmt = fmt_12;
 
-  freeipa = callPackage ../os-specific/linux/freeipa {
-    # NOTE: freeipa and sssd need to be built with the same version of python
-    kerberos = krb5.override {
-      withVerto = true;
-    };
-    sasl = cyrus_sasl;
-    samba = samba4.override {
-      enableLDAP = true;
-    };
-  };
-
   fontconfig = callPackage ../development/libraries/fontconfig { };
 
   makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { };

From eabd21e434140ec58bdca220ffede64e1019ce76 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 3 Mar 2026 10:05:41 -0600
Subject: [PATCH 11/50] freeipa: modernize derivation

---
 pkgs/by-name/fr/freeipa/package.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/fr/freeipa/package.nix b/pkgs/by-name/fr/freeipa/package.nix
index fa66da6d8212..6813e656de96 100644
--- a/pkgs/by-name/fr/freeipa/package.nix
+++ b/pkgs/by-name/fr/freeipa/package.nix
@@ -27,7 +27,7 @@
   libverto,
   libpwquality,
   systemd,
-  python3,
+  python3Packages,
   bind,
   sssd,
   jre,
@@ -39,7 +39,7 @@
 }:
 
 let
-  pythonInputs = with python3.pkgs; [
+  pythonInputs = with python3Packages; [
     distutils
     six
     python-ldap
@@ -73,12 +73,12 @@ let
     enableLDAP = true;
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "freeipa";
   version = "4.12.5";
 
   src = fetchurl {
-    url = "https://releases.pagure.org/freeipa/freeipa-${version}.tar.gz";
+    url = "https://releases.pagure.org/freeipa/freeipa-${finalAttrs.version}.tar.gz";
     hash = "sha256-jvXS9Hx9VGFccFL19HogfH15JVIW7pc3/TY1pOvJglM=";
   };
 
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    python3.pkgs.wrapPython
+    python3Packages.wrapPython
     jre
     rhino
     lesscpy
@@ -115,7 +115,6 @@ stdenv.mkDerivation rec {
     xmlrpc_c
     ding-libs
     p11-kit
-    python3
     nspr
     nss
     _389-ds-base
@@ -178,7 +177,7 @@ stdenv.mkDerivation rec {
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
+  versionCheckProgram = "${placeholder "out"}/bin/ipa";
   doInstallCheck = true;
 
   meta = {
@@ -199,4 +198,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     mainProgram = "ipa";
   };
-}
+})

From b7910c114700deeda0b2a3438bc4f056d03f0d0a Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 3 Mar 2026 19:32:59 -0600
Subject: [PATCH 12/50] ffado,ffado-mixer: migrate to by-name

---
 pkgs/by-name/ff/ffado-mixer/package.nix                    | 7 +++++++
 .../ffado/default.nix => by-name/ff/ffado/package.nix}     | 0
 pkgs/top-level/all-packages.nix                            | 2 --
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/ff/ffado-mixer/package.nix
 rename pkgs/{os-specific/linux/ffado/default.nix => by-name/ff/ffado/package.nix} (100%)

diff --git a/pkgs/by-name/ff/ffado-mixer/package.nix b/pkgs/by-name/ff/ffado-mixer/package.nix
new file mode 100644
index 000000000000..40314ba49aac
--- /dev/null
+++ b/pkgs/by-name/ff/ffado-mixer/package.nix
@@ -0,0 +1,7 @@
+{
+  ffado,
+}:
+
+ffado.override {
+  withMixer = true;
+}
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/by-name/ff/ffado/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ffado/default.nix
rename to pkgs/by-name/ff/ffado/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 788e8b7fd30f..4b138b42dcc6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8602,8 +8602,6 @@ with pkgs;
 
   error-inject = recurseIntoAttrs (callPackages ../os-specific/linux/error-inject { });
 
-  ffado = callPackage ../os-specific/linux/ffado { };
-  ffado-mixer = callPackage ../os-specific/linux/ffado { withMixer = true; };
   libffado = ffado;
 
   freefall = callPackage ../os-specific/linux/freefall {

From 70d1c5091ecfc7356d9a2794cdd0db115afc3a37 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Mar 2026 21:18:57 +0100
Subject: [PATCH 13/50] python3Packages.llama-index-graph-stores-neo4j: 0.5.2
 -> 0.6.0

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

diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
index 22564440cbc3..60ff2e75cdfa 100644
--- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
+++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "llama-index-graph-stores-neo4j";
-  version = "0.5.2";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_graph_stores_neo4j";
     inherit (finalAttrs) version;
-    hash = "sha256-TPPZyKD6sFX/qsHSTiidT6idXnW1edSv1ZbOXopa3lI=";
+    hash = "sha256-iLK5DLsctmoQ9dDXYSraZtwVycs5GxzEtjJLuyOYRuw=";
   };
 
   pythonRelaxDeps = [ "neo4j" ];

From 28e68a05225e0afcd84faada0bc0657343fe6415 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Mar 2026 21:28:13 +0100
Subject: [PATCH 14/50] python3Packages.pyexploitdb: 0.3.15 -> 0.3.16

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 676673c787cc..5bdb2de4717b 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyexploitdb";
-  version = "0.3.15";
+  version = "0.3.16";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-8ifQNytDODC98yD6eXjLQOr9pQFztgbxUrRPRMGqrHA=";
+    hash = "sha256-KNnKMCHhHrnqQ5YQ10Zk3LV89SZKC2g69m/pIY+zHRY=";
   };
 
   build-system = [ setuptools ];

From 0bf27e47e1f9cd7266cbe4d09a6f6e0fd8a45de1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Mar 2026 21:31:49 +0100
Subject: [PATCH 15/50] python3Packages.starlette-context: 0.4.0 -> 0.5.1

Changelog: https://github.com/tomwojcik/starlette-context/releases/tag/v0.5.1
---
 .../python-modules/starlette-context/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/starlette-context/default.nix b/pkgs/development/python-modules/starlette-context/default.nix
index 1aa054adc8a3..730c9185ff3b 100644
--- a/pkgs/development/python-modules/starlette-context/default.nix
+++ b/pkgs/development/python-modules/starlette-context/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   httpx,
-  poetry-core,
+  hatchling,
   pytest-asyncio,
   pytestCheckHook,
   starlette,
@@ -11,17 +11,17 @@
 
 buildPythonPackage rec {
   pname = "starlette-context";
-  version = "0.4.0";
+  version = "0.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tomwojcik";
     repo = "starlette-context";
     tag = "v${version}";
-    hash = "sha256-PzVZ458TdBLdbFJDN+X8hVU5zsRxcesihoDB+jRaKAg=";
+    hash = "sha256-cxhTrLLIjlqaR07VVgHmvYctk7+7fDjbGb39PbJbGgk=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [ starlette ];
 

From 6cd81a1e69b7abfdec250b910db5888fcf132b78 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Mar 2026 21:33:48 +0100
Subject: [PATCH 16/50] python3Packages.starlette-context: migrate to
 finalAttrs

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

diff --git a/pkgs/development/python-modules/starlette-context/default.nix b/pkgs/development/python-modules/starlette-context/default.nix
index 730c9185ff3b..a18225be77ab 100644
--- a/pkgs/development/python-modules/starlette-context/default.nix
+++ b/pkgs/development/python-modules/starlette-context/default.nix
@@ -9,7 +9,7 @@
   starlette,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "starlette-context";
   version = "0.5.1";
   pyproject = true;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tomwojcik";
     repo = "starlette-context";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-cxhTrLLIjlqaR07VVgHmvYctk7+7fDjbGb39PbJbGgk=";
   };
 
@@ -36,8 +36,8 @@ buildPythonPackage rec {
   meta = {
     description = "Middleware for Starlette that allows you to store and access the context data of a request";
     homepage = "https://github.com/tomwojcik/starlette-context";
-    changelog = "https://github.com/tomwojcik/starlette-context/releases/tag/v${version}";
+    changelog = "https://github.com/tomwojcik/starlette-context/releases/tag/v${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 57e7fc6494b855bf4403cf384c4342924e42f79b Mon Sep 17 00:00:00 2001
From: Vladislav Grechannik <vgrechannik@gmail.com>
Date: Wed, 4 Mar 2026 22:11:38 +0100
Subject: [PATCH 17/50] python313Packages.bgutil-ytdlp-pot-provider: 1.2.2 ->
 1.3.0

Diff: https://github.com/Brainicism/bgutil-ytdlp-pot-provider/compare/1.2.2...1.3.0
---
 .../python-modules/bgutil-ytdlp-pot-provider/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix b/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix
index 2b067e2d7b40..b7f7e416aa11 100644
--- a/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix
+++ b/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "bgutil-ytdlp-pot-provider";
-  version = "1.2.2";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Brainicism";
     repo = "bgutil-ytdlp-pot-provider";
     tag = version;
-    hash = "sha256-KKImGxFGjClM2wAk/L8nwauOkM/gEwRVMZhTP62ETqY=";
+    hash = "sha256-WPLNjfVYDbPsEMVhjuF3dVarahdIKT7pt518SePfB8A=";
   };
 
   sourceRoot = "${src.name}/plugin";

From a89c8e48b7ffeb122ee53691131ddb74402b92f3 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 4 Mar 2026 18:33:07 -0600
Subject: [PATCH 18/50] device-tree_rpi: migrate to by-name

---
 .../raspberrypi.nix => by-name/de/device-tree_rpi/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{os-specific/linux/device-tree/raspberrypi.nix => by-name/de/device-tree_rpi/package.nix} (100%)

diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/by-name/de/device-tree_rpi/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/device-tree/raspberrypi.nix
rename to pkgs/by-name/de/device-tree_rpi/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d57ac640cf35..5f728ab0a41e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -382,8 +382,6 @@ with pkgs;
   ollama-cuda = callPackage ../by-name/ol/ollama/package.nix { acceleration = "cuda"; };
   ollama-vulkan = callPackage ../by-name/ol/ollama/package.nix { acceleration = "vulkan"; };
 
-  device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix { };
-
   diffPlugins = (callPackage ../build-support/plugins.nix { }).diffPlugins;
 
   dieHook = makeSetupHook {

From b52eb3ffc6547d6f1316a0051a0844c9de90a59b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Mar 2026 01:57:49 +0100
Subject: [PATCH 19/50] python314Packages.publicsuffixlist: 1.0.2.20260228 ->
 1.0.2.20260303

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20260303-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 92dc955ddd38..6ac9d9676dce 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "publicsuffixlist";
-  version = "1.0.2.20260228";
+  version = "1.0.2.20260303";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-D3WM8ZIAErvf/R/SuI3CIFD4w7YN511Vm+rNcxl1dE4=";
+    hash = "sha256-6+6YSEb67K1R9eADW6zZAd6JgSPabY49Fp5s3CRBoo0=";
   };
 
   postPatch = ''

From fdc4376846f7d4152d5fce8b879c162eaae26c9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2026 06:24:19 +0000
Subject: [PATCH 20/50] atlauncher: 3.4.40.2 -> 3.4.40.3

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

diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix
index 5e406a8ef485..118041f76ed9 100644
--- a/pkgs/by-name/at/atlauncher/package.nix
+++ b/pkgs/by-name/at/atlauncher/package.nix
@@ -27,13 +27,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "atlauncher";
-  version = "3.4.40.2";
+  version = "3.4.40.3";
 
   src = fetchFromGitHub {
     owner = "ATLauncher";
     repo = "ATLauncher";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-sV6eWIgx/0e+uUCbbRwAPPqNcFWUQWyuHnzrwcYJkqA=";
+    hash = "sha256-QFPdEH3V9Krwy/cWCbY+IMtW0ydVCqKr/OZfttZGCss=";
   };
 
   nativeBuildInputs = [

From ddde5c583ad101852854474c65badca996dd07c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2026 06:53:23 +0000
Subject: [PATCH 21/50] python3Packages.claude-agent-sdk: 0.1.44 -> 0.1.46

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

diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix
index 3f7177a39da8..8fb968e2bee2 100644
--- a/pkgs/development/python-modules/claude-agent-sdk/default.nix
+++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "claude-agent-sdk";
-  version = "0.1.44";
+  version = "0.1.46";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthropics";
     repo = "claude-agent-sdk-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YRXSQsJYNhwV43x1iQbnwm23Hllr/SXl8Fv91/AWh8Y=";
+    hash = "sha256-Cxffdl8oQ9//lURbIVhhX9g1sin2BRj9hJ1/A6Tb++o=";
   };
 
   build-system = [ hatchling ];

From 8e6e532b5ace1becd8113fc6f83814b5b6b7c2f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2026 15:16:23 +0000
Subject: [PATCH 22/50] eigenwallet: 3.6.7 -> 3.7.0

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

diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix
index 9fc7b7afc79c..6f583604ccd3 100644
--- a/pkgs/by-name/ei/eigenwallet/package.nix
+++ b/pkgs/by-name/ei/eigenwallet/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eigenwallet";
-  version = "3.6.7";
+  version = "3.7.0";
 
   src = fetchurl {
     url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-kIu0TLFw5hxUnCItgSNB+XuxpC1gKXvu+k4vQH1UitA=";
+    hash = "sha256-0iLO9D2Xvgn2bkTbl6c/XGBRJm3t4AuoYRlCZaxHneo=";
   };
 
   nativeBuildInputs = [

From 5c9cee17c8b7fe3c1c8ab3fc8a8bfa1356e929bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2026 15:42:01 +0000
Subject: [PATCH 23/50] myks: 5.9.2 -> 5.9.3

---
 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 2de933e8f274..3a742a500f17 100644
--- a/pkgs/by-name/my/myks/package.nix
+++ b/pkgs/by-name/my/myks/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "myks";
-  version = "5.9.2";
+  version = "5.9.3";
 
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xDggxh9IkfFwKFS5U3SmL4HCbMw3J+N+vYNKfmh0E44=";
+    hash = "sha256-D1JLpDueIFMZS2RebFvlNI9eNDd1nWohzmPR8sUDXMc=";
   };
 
-  vendorHash = "sha256-b1uLNz8dSJnJ0tevdm79x9YVas+Wh9//4o+k6fEckZA=";
+  vendorHash = "sha256-XMGcLYMZiCB98U5+aB/O4f5knAp46UkrH4teCPZk/bM=";
 
   subPackages = ".";
 

From ec0a282f18c1f156cd4fccb82ad517d9a959cda5 Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Thu, 5 Mar 2026 18:25:22 +0100
Subject: [PATCH 24/50] linuxPackages.nvidiaPackages.beta: 590.44.01 ->
 595.45.04

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index d64fb8c6845c..186127d7b298 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -90,12 +90,12 @@ rec {
   });
 
   beta = selectHighestVersion latest (generic {
-    version = "590.44.01";
-    sha256_64bit = "sha256-VbkVaKwElaazojfxkHnz/nN/5olk13ezkw/EQjhKPms=";
-    sha256_aarch64 = "sha256-gpqz07aFx+lBBOGPMCkbl5X8KBMPwDqsS+knPHpL/5g=";
-    openSha256 = "sha256-ft8FEnBotC9Bl+o4vQA1rWFuRe7gviD/j1B8t0MRL/o=";
-    settingsSha256 = "sha256-wVf1hku1l5OACiBeIePUMeZTWDQ4ueNvIk6BsW/RmF4=";
-    persistencedSha256 = "sha256-nHzD32EN77PG75hH9W8ArjKNY/7KY6kPKSAhxAWcuS4=";
+    version = "595.45.04";
+    sha256_64bit = "sha256-zUllSSRsuio7dSkcbBTuxF+dN12d6jEPE0WgGvVOj14=";
+    sha256_aarch64 = "sha256-jl6lQWsgF6ya22sAhYPpERJ9r+wjnWzbGnINDpUMzsk=";
+    openSha256 = "sha256-uqNfImwTKhK8gncUdP1TPp0D6Gog4MSeIJMZQiJWDoE=";
+    settingsSha256 = "sha256-Y45pryyM+6ZTJyRaRF3LMKaiIWxB5gF5gGEEcQVr9nA=";
+    persistencedSha256 = "sha256-5FoeUaRRMBIPEWGy4Uo0Aho39KXmjzQsuAD9m/XkNpA=";
   });
 
   # Vulkan developer beta driver

From ef0adc33fa96be8da79459d2319fa026e565f666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 5 Mar 2026 18:44:08 +0100
Subject: [PATCH 25/50] azure-cli-extensions.confcom: 1.2.6 -> 1.8.0, fix build

---
 pkgs/by-name/az/azure-cli/extensions-manual.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix
index 5176abb9c1bf..e8c083fb45c1 100644
--- a/pkgs/by-name/az/azure-cli/extensions-manual.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix
@@ -10,7 +10,7 @@
   python3Packages,
   autoPatchelfHook,
   python3,
-  openssl_1_1,
+  openssl,
 }:
 
 {
@@ -173,16 +173,18 @@
 
   confcom = mkAzExtension rec {
     pname = "confcom";
-    version = "1.2.6";
+    version = "1.8.0";
     url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl";
-    hash = "sha256-kyJ4AkPcpP/10nf4whJiuraC7hn0E6iBkhRIn43E9J0=";
+    hash = "sha256-rKEECrGR4VIKTgPzInGhFrbrXDtYqayAzYWLKclE1tg=";
     description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension";
     nativeBuildInputs = [ autoPatchelfHook ];
-    buildInputs = [ openssl_1_1 ];
+    buildInputs = [ openssl ];
+    pythonRelaxDeps = [ "tqdm" ];
     propagatedBuildInputs = with python3Packages; [
-      pyyaml
       deepdiff
       docker
+      pydantic
+      pyyaml
       tqdm
     ];
     postInstall = ''

From 3304a302e007002ba6775e3f75aa4634ab9e44ac Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 5 Mar 2026 14:52:17 -0600
Subject: [PATCH 26/50] mangohud: migrate to by-name

---
 .../ma}/mangohud/hardcode-dependencies.patch             | 0
 .../default.nix => by-name/ma/mangohud/package.nix}      | 9 ++++++---
 .../ma}/mangohud/preload-nix-workaround.patch            | 0
 pkgs/top-level/all-packages.nix                          | 5 -----
 4 files changed, 6 insertions(+), 8 deletions(-)
 rename pkgs/{tools/graphics => by-name/ma}/mangohud/hardcode-dependencies.patch (100%)
 rename pkgs/{tools/graphics/mangohud/default.nix => by-name/ma/mangohud/package.nix} (96%)
 rename pkgs/{tools/graphics => by-name/ma}/mangohud/preload-nix-workaround.patch (100%)

diff --git a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch b/pkgs/by-name/ma/mangohud/hardcode-dependencies.patch
similarity index 100%
rename from pkgs/tools/graphics/mangohud/hardcode-dependencies.patch
rename to pkgs/by-name/ma/mangohud/hardcode-dependencies.patch
diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/by-name/ma/mangohud/package.nix
similarity index 96%
rename from pkgs/tools/graphics/mangohud/default.nix
rename to pkgs/by-name/ma/mangohud/package.nix
index aab550797ac2..36d24d92a496 100644
--- a/pkgs/tools/graphics/mangohud/default.nix
+++ b/pkgs/by-name/ma/mangohud/package.nix
@@ -13,7 +13,7 @@
   libGL,
   libx11,
   hwdata,
-  mangohud32,
+  pkgsi686Linux,
   addDriverRunpath,
   appstream,
   glslang,
@@ -23,14 +23,14 @@
   pkg-config,
   unzip,
   wayland,
-  libXNVCtrl,
+  linuxPackages,
   spdlog,
   libxkbcommon,
   glfw,
   libxrandr,
   x11Support ? true,
   waylandSupport ? true,
-  nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform libXNVCtrl,
+  nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform linuxPackages.nvidia_x11.settings.libXNVCtrl,
   gamescopeSupport ? true,
   mangoappSupport ? gamescopeSupport,
   mangohudctlSupport ? gamescopeSupport,
@@ -90,6 +90,9 @@ let
       hash = "sha256-hgNYz15z9FjNHoj4w4EW0SOrQh1c4uQSnsOOrt2CDhc=";
     };
   };
+  libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
+  mangohud32 = pkgsi686Linux.mangohud;
+
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mangohud";
diff --git a/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch b/pkgs/by-name/ma/mangohud/preload-nix-workaround.patch
similarity index 100%
rename from pkgs/tools/graphics/mangohud/preload-nix-workaround.patch
rename to pkgs/by-name/ma/mangohud/preload-nix-workaround.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a74ca9d7fd5c..9886ef78b806 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2939,11 +2939,6 @@ with pkgs;
 
   man = man-db;
 
-  mangohud = callPackage ../tools/graphics/mangohud {
-    libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
-    mangohud32 = pkgsi686Linux.mangohud;
-  };
-
   marimo = with python3Packages; toPythonApplication marimo;
 
   mcstatus = with python3Packages; toPythonApplication mcstatus;

From f73ca04ed4e4ec846fee1bcb85b33fd77be86b30 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 5 Mar 2026 15:13:18 -0600
Subject: [PATCH 27/50] nvfancontrol: migrate to by-name

---
 .../default.nix => by-name/nv/nvfancontrol/package.nix}     | 6 ++++--
 pkgs/top-level/all-packages.nix                             | 4 ----
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename pkgs/{tools/misc/nvfancontrol/default.nix => by-name/nv/nvfancontrol/package.nix} (91%)

diff --git a/pkgs/tools/misc/nvfancontrol/default.nix b/pkgs/by-name/nv/nvfancontrol/package.nix
similarity index 91%
rename from pkgs/tools/misc/nvfancontrol/default.nix
rename to pkgs/by-name/nv/nvfancontrol/package.nix
index 48b7872c9c84..7fa9d965320d 100644
--- a/pkgs/tools/misc/nvfancontrol/default.nix
+++ b/pkgs/by-name/nv/nvfancontrol/package.nix
@@ -2,11 +2,13 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  libXNVCtrl,
+  linuxPackages,
   libx11,
   libxext,
 }:
-
+let
+  libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
+in
 rustPlatform.buildRustPackage rec {
   pname = "nvfancontrol";
   version = "0.5.1";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a74ca9d7fd5c..116195a47354 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3082,10 +3082,6 @@ with pkgs;
   # ntfsprogs are merged into ntfs-3g
   ntfsprogs = pkgs.ntfs3g;
 
-  nvfancontrol = callPackage ../tools/misc/nvfancontrol {
-    libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
-  };
-
   nwdiag = with python3Packages; toPythonApplication nwdiag;
 
   ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { };

From 2f43ec99e2366b64aefb8e30c5af16ac58febefb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@cachix.org>
Date: Thu, 5 Mar 2026 14:03:23 -0800
Subject: [PATCH 28/50] devenv: 2.0.1 -> 2.0.2

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

diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index a899402de21c..208cdc7e6988 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -23,7 +23,7 @@
 }:
 
 let
-  version = "2.0.1";
+  version = "2.0.2";
   devenvNixVersion = "2.32";
   devenvNixRev = "7eb6c427c7a86fdc3ebf9e6cbf2a84e80e8974fd";
 
@@ -48,15 +48,16 @@ rustPlatform.buildRustPackage {
     owner = "cachix";
     repo = "devenv";
     tag = "v${version}";
-    hash = "sha256-cZRSu+XbZ2P91cKsjHBAc5uu6fblUyBVE1Cvk3ywPaM=";
+    hash = "sha256-38crLoAfEOdnEDDZD2NyAEDVlBSFn+MlZyLwztAsC8Q=";
   };
 
-  cargoHash = "sha256-dzho5gZmfji4n+zHwr2uCqOijCFpVj9loYr8VQNil3g=";
+  cargoHash = "sha256-e56HmkS+p8P/X7vS+hTT78lfQ2YDCuONM+6yW0RIfSE=";
 
   env = {
     RUSTFLAGS = "--cfg tracing_unstable";
     LIBSQLITE3_SYS_USE_PKG_CONFIG = "1";
     VERGEN_IDEMPOTENT = "1";
+    DEVENV_ON_RELEASE_TAG = true;
   };
 
   cargoBuildFlags = [

From fb5b3c5c30f3d3adb0b8d0e59d79ddf5198770a5 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Thu, 5 Mar 2026 02:58:30 -0700
Subject: [PATCH 29/50] libvirt: fix virt-secret-init-encryption

---
 pkgs/by-name/li/libvirt/package.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix
index e8544e5204b6..b1b7ef54b02b 100644
--- a/pkgs/by-name/li/libvirt/package.nix
+++ b/pkgs/by-name/li/libvirt/package.nix
@@ -33,11 +33,13 @@
   python3,
   readline,
   rpcsvc-proto,
+  runtimeShell,
   stdenv,
   replaceVars,
   xhtml1,
   json_c,
   writeScript,
+  writeShellApplication,
   nixosTests,
 
   # Linux
@@ -179,7 +181,23 @@ stdenv.mkDerivation rec {
     sed -i '/libxlxml2domconfigtest/d' tests/meson.build
     substituteInPlace src/libxl/libxl_capabilities.h \
      --replace-fail /usr/lib/xen ${xen}/libexec/xen
-  '';
+  ''
+  + lib.optionalString isLinux (
+    let
+      script = writeShellApplication {
+        name = "virt-secret-init-encryption-sh";
+        runtimeInputs = [
+          coreutils
+          systemd
+        ];
+        text = ''exec ${runtimeShell} "$@"'';
+      };
+    in
+    ''
+      substituteInPlace src/secret/virt-secret-init-encryption.service.in \
+        --replace-fail /usr/bin/sh ${lib.getExe script}
+    ''
+  );
 
   strictDeps = true;
 

From d699415ebe3add131044bcfd355ed1aa849bb646 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Thu, 5 Mar 2026 16:33:04 -0700
Subject: [PATCH 30/50] nixos/libvirtd: add secrets to StateDirectory

---
 nixos/modules/virtualisation/libvirtd.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 7bca79260362..d7313a0bcc57 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -530,7 +530,10 @@ in
           "nix-helpers"
           "nix-ovmf"
         ];
-        StateDirectory = subDirs [ "dnsmasq" ];
+        StateDirectory = subDirs [
+          "dnsmasq"
+          "secrets"
+        ];
       };
     };
 

From 4f4109fff12a2d9db9eb3a2289bbed778492b925 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2026 23:34:34 +0000
Subject: [PATCH 31/50] python3Packages.alexapy: 1.29.17 -> 1.29.19

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

diff --git a/pkgs/development/python-modules/alexapy/default.nix b/pkgs/development/python-modules/alexapy/default.nix
index 4d83bf085028..658b6408cded 100644
--- a/pkgs/development/python-modules/alexapy/default.nix
+++ b/pkgs/development/python-modules/alexapy/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "alexapy";
-  version = "1.29.17";
+  version = "1.29.19";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "keatontaylor";
     repo = "alexapy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5iH7nk8TwlwM56rXxaHKcpvOJ1pLge7PZ1C1f9NALlM=";
+    hash = "sha256-1PFHIVtFaaYRyOgzqxMCbvbSECK+9T7EuRlQ9CWuv5Y=";
   };
 
   pythonRelaxDeps = [ "aiofiles" ];

From 4c1ab8020ac9ef8d6d669c94b9dac2d494d69795 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2026 02:01:24 +0000
Subject: [PATCH 32/50] pgdog: 0.1.30 -> 0.1.31

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

diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix
index c3e61ebf5450..897d5d3af529 100644
--- a/pkgs/by-name/pg/pgdog/package.nix
+++ b/pkgs/by-name/pg/pgdog/package.nix
@@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
   pname = "pgdog";
-  version = "0.1.30";
+  version = "0.1.31";
 
   src = fetchFromGitHub {
     owner = "pgdogdev";
     repo = "pgdog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oobSNeafVWwYmvYs4REV7RuqVMIob3JruMjgN/wzNFA=";
+    hash = "sha256-BO1EhlGAdGks5zGQddljFy8DXHISv4cMCeuC3UAw8jw=";
   };
 
-  cargoHash = "sha256-Cm/wJtNwHuJklk8b39Fk+SzxWjGE2qGcJD/ekydcBxE=";
+  cargoHash = "sha256-Fkj2cyPTBTudKSh4c3dzfAz2B4ZryFiCu5y3WMXZ7Dg=";
 
   # Hardcoded paths for C compiler and linker
   postPatch = ''

From 48029ea577290e99778b1ecc991d32baad8e9530 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Mar 2026 03:07:58 +0100
Subject: [PATCH 33/50] python3Packages.heretic-llm: init at 1.2.0

Tool to remove censorship removal for language models

https://github.com/p-e-w/heretic
---
 pkgs/by-name/he/heretic/package.nix           |  1 +
 .../python-modules/heretic-llm/default.nix    | 90 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 93 insertions(+)
 create mode 100644 pkgs/by-name/he/heretic/package.nix
 create mode 100644 pkgs/development/python-modules/heretic-llm/default.nix

diff --git a/pkgs/by-name/he/heretic/package.nix b/pkgs/by-name/he/heretic/package.nix
new file mode 100644
index 000000000000..5b5529712aa0
--- /dev/null
+++ b/pkgs/by-name/he/heretic/package.nix
@@ -0,0 +1 @@
+{ python3Packages }: with python3Packages; toPythonApplication heretic-llm
diff --git a/pkgs/development/python-modules/heretic-llm/default.nix b/pkgs/development/python-modules/heretic-llm/default.nix
new file mode 100644
index 000000000000..749d46b9fad9
--- /dev/null
+++ b/pkgs/development/python-modules/heretic-llm/default.nix
@@ -0,0 +1,90 @@
+{
+  lib,
+  accelerate,
+  bitsandbytes,
+  buildPythonPackage,
+  datasets,
+  fetchFromGitHub,
+  # geom-median,
+  hf-transfer,
+  huggingface-hub,
+  imageio,
+  kernels,
+  matplotlib,
+  numpy,
+  optuna,
+  # pacmap,
+  peft,
+  psutil,
+  pydantic-settings,
+  questionary,
+  rich,
+  scikit-learn,
+  transformers,
+  uv-build,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "heretic-llm";
+  version = "1.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "p-e-w";
+    repo = "heretic";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-KmqbOAOII1SP7wpdvGxtzQJt5NmlnF/o99NuZ21vO0s=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.8.11,<0.9.0" "uv_build"
+  '';
+
+  pythonRelaxDeps = [
+    "huggingface-hub"
+    "transformers"
+  ];
+
+  build-system = [ uv-build ];
+
+  dependencies = [
+    accelerate
+    bitsandbytes
+    datasets
+    hf-transfer
+    huggingface-hub
+    kernels
+    optuna
+    peft
+    psutil
+    pydantic-settings
+    questionary
+    rich
+    transformers
+  ];
+
+  optional-dependencies = {
+    research = [
+      # geom-median
+      imageio
+      matplotlib
+      numpy
+      # pacmap
+      scikit-learn
+    ];
+  };
+
+  pythonImportsCheck = [ "heretic" ];
+
+  meta = {
+    description = "Tool to remove censorship removal for language models";
+    homepage = "https://github.com/p-e-w/heretic";
+    changelog = "https://github.com/p-e-w/heretic/releases/tag/v${finalAttrs.src.tag}";
+    license = with lib.licenses; [
+      agpl3Only
+      agpl3Plus
+    ];
+    maintainers = with lib.maintainers; [ fab ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8e27fb27d8d6..28daecc9aab2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6970,6 +6970,8 @@ self: super: with self; {
 
   herepy = callPackage ../development/python-modules/herepy { };
 
+  heretic-llm = callPackage ../development/python-modules/heretic-llm { };
+
   hetzner = callPackage ../development/python-modules/hetzner { };
 
   heudiconv = callPackage ../development/python-modules/heudiconv { };

From 1e4698c776918100cac25ca150cd132b282a21c5 Mon Sep 17 00:00:00 2001
From: Alastair Pharo <asppsa@gmail.com>
Date: Fri, 6 Mar 2026 18:00:13 +1100
Subject: [PATCH 34/50] binaryen: remove asppsa from maintainer list

This is myself.  I'm unfortunately not able to contribute to this maintenance anymore.
---
 pkgs/development/compilers/binaryen/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index 5955fea3e628..6826c2ab2d51 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -97,7 +97,6 @@ stdenv.mkDerivation rec {
     description = "Compiler infrastructure and toolchain library for WebAssembly, in C++";
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
-      asppsa
       willcohen
     ];
     license = lib.licenses.asl20;

From e4074f13905f5117d20ad71358596b41694863aa Mon Sep 17 00:00:00 2001
From: Leon Klingele <git@leonklingele.de>
Date: Fri, 6 Mar 2026 06:42:40 +0100
Subject: [PATCH 35/50] go_1_26: 1.26.0 -> 1.26.1

Signed-off-by: Leon Klingele <git@leonklingele.de>
---
 pkgs/development/compilers/go/1.26.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.26.nix b/pkgs/development/compilers/go/1.26.nix
index 78ef28f01a79..57c3227d5f76 100644
--- a/pkgs/development/compilers/go/1.26.nix
+++ b/pkgs/development/compilers/go/1.26.nix
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.26.0";
+  version = "1.26.1";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-yRMqih9r0qpKrR10uCMdlSdJUEg6SVBlfubFbm6Bd5A=";
+    hash = "sha256-MXIpPQSyCdwRRGmOe6E/BHf2uoxf/QvmbCD9vJeF37s=";
   };
 
   strictDeps = true;

From 616131f3cf2419e1e656241fc9fcaf63239c8510 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2026 08:19:01 +0000
Subject: [PATCH 36/50] grpc-health-probe: 0.4.45 -> 0.4.46

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

diff --git a/pkgs/by-name/gr/grpc-health-probe/package.nix b/pkgs/by-name/gr/grpc-health-probe/package.nix
index cc70b77db279..0169bc7b2c50 100644
--- a/pkgs/by-name/gr/grpc-health-probe/package.nix
+++ b/pkgs/by-name/gr/grpc-health-probe/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "grpc-health-probe";
-  version = "0.4.45";
+  version = "0.4.46";
 
   src = fetchFromGitHub {
     owner = "grpc-ecosystem";
     repo = "grpc-health-probe";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-kzliXJJHVw75wBJ7GKkCxKiuE7tnprIrm1ss9FoHKB8=";
+    hash = "sha256-+HLYlC0B97iI0Z0bJ1bLTVGi/VtynKmmLBnlS3KcpXY=";
   };
 
   tags = [
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
     "-X main.versionTag=${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-WGY4vj1a+sOKKmuY+1RD/GPOKIUunfdBor0xG64IJY8=";
+  vendorHash = "sha256-4JvUAA1yt9s3pSEGtP7TY96rco64yaNnGC9ZlyzKM5g=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 213ebf03abdf1af415787416e294d3d04611ec25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2026 08:19:18 +0000
Subject: [PATCH 37/50] 
 home-assistant-custom-lovelace-modules.advanced-camera-card: 7.27.3 -> 7.27.4

---
 .../custom-lovelace-modules/advanced-camera-card/package.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
index 7492d0895f40..d480e09d7bbb 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "advanced-camera-card";
-  version = "7.27.3";
+  version = "7.27.4";
 
   src = fetchzip {
     url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip";
-    hash = "sha256-1O0li7OIG0AtNmj2fTuQ8HXWvL0ocx7jCsTKdaUOBcI=";
+    hash = "sha256-lBdJBn/TLU3ezZnUJLt4eH87n1pOizS68RfLHYyRUq0=";
   };
 
   # TODO: build from source once yarn berry support lands in nixpkgs

From 6f87691cdd95f75bc3aed7054b6fce3156e0a805 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 6 Mar 2026 08:04:43 +0100
Subject: [PATCH 38/50] libvirt: fix darwin build

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

diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix
index e8544e5204b6..123407423908 100644
--- a/pkgs/by-name/li/libvirt/package.nix
+++ b/pkgs/by-name/li/libvirt/package.nix
@@ -165,6 +165,7 @@ stdenv.mkDerivation rec {
     # Darwin doesn’t support -fsemantic-interposition, but the problem doesn’t seem to affect Mach-O.
     # See https://gitlab.com/libvirt/libvirt/-/merge_requests/235
     sed -i "s/not supported_cc_flags.contains('-fsemantic-interposition')/false/" meson.build
+    sed -i '/qemucapabilitiestest/d' tests/meson.build
     sed -i '/qemufirmwaretest/d' tests/meson.build
     sed -i '/qemuhotplugtest/d' tests/meson.build
     sed -i '/qemuvhostusertest/d' tests/meson.build

From b571bcb9b7edcd49c0f71fadde6ae5d4b7c12610 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 6 Mar 2026 09:41:15 +0100
Subject: [PATCH 39/50] diff-pdf: migrate to by-name

---
 .../diff-pdf/default.nix => by-name/di/diff-pdf/package.nix}  | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/misc/diff-pdf/default.nix => by-name/di/diff-pdf/package.nix} (95%)

diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/by-name/di/diff-pdf/package.nix
similarity index 95%
rename from pkgs/applications/misc/diff-pdf/default.nix
rename to pkgs/by-name/di/diff-pdf/package.nix
index c4b9d33aed63..b0e258f82e63 100644
--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/pkgs/by-name/di/diff-pdf/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   cairo,
   poppler,
-  wxGTK,
+  wxwidgets_3_2,
 }:
 
 stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     cairo
     poppler
-    wxGTK
+    wxwidgets_3_2
   ];
 
   preConfigure = "./bootstrap";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 803a078e5245..b8bc5e466ab7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10232,10 +10232,6 @@ with pkgs;
 
   diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { };
 
-  diff-pdf = callPackage ../applications/misc/diff-pdf {
-    wxGTK = wxwidgets_3_2;
-  };
-
   mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { };
 
   mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { };

From df5f0e2053f5c8b2d047e0f59c586c0459a37fe5 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 6 Mar 2026 09:47:07 +0100
Subject: [PATCH 40/50] wxmaxima: migrate to by-name

---
 .../default.nix => by-name/wx/wxmaxima/package.nix}         | 6 +++---
 pkgs/top-level/all-packages.nix                             | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)
 rename pkgs/{applications/science/math/wxmaxima/default.nix => by-name/wx/wxmaxima/package.nix} (92%)

diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/by-name/wx/wxmaxima/package.nix
similarity index 92%
rename from pkgs/applications/science/math/wxmaxima/default.nix
rename to pkgs/by-name/wx/wxmaxima/package.nix
index c05d363566ea..f22dc9cba856 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/by-name/wx/wxmaxima/package.nix
@@ -6,7 +6,7 @@
   cmake,
   gettext,
   maxima,
-  wxGTK,
+  wxwidgets_3_2,
   adwaita-icon-theme,
   glib,
 }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    wxGTK
+    wxwidgets_3_2
     maxima
     # So it won't embed svg files into headers.
     adwaita-icon-theme
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DwxWidgets_LIBRARIES=${wxGTK}/lib"
+    "-DwxWidgets_LIBRARIES=${wxwidgets_3_2}/lib"
   ];
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 803a078e5245..832cbd078aa9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11941,12 +11941,6 @@ with pkgs;
     lisp-compiler = ecl;
   };
 
-  wxmaxima = callPackage ../applications/science/math/wxmaxima {
-    wxGTK = wxwidgets_3_2.override {
-      withWebKit = true;
-    };
-  };
-
   yacas-gui = yacas.override {
     enableGui = true;
     enableJupyter = false;

From c8704486ebbe185233e4ae47d33cba5f3afd3b1d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Mar 2026 19:26:16 +0100
Subject: [PATCH 41/50] python3Packages.iamdata: 0.1.202603041 -> 0.1.202603051

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202603041...v0.1.202603051

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202603051
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index d66c4572a393..4ea1cb897056 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202603041";
+  version = "0.1.202603051";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LsBAC6EAHl/vrGmiOy/fJoUhq5a73Qs07M7Fh7bF6mY=";
+    hash = "sha256-f6NQH4RVZxf27A3gKDiewigdNw9IELikQSFmGSx9hng=";
   };
 
   __darwinAllowLocalNetworking = true;

From d91e3506eeb7705f49b0eef6deac5c112f6e1554 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Fri, 6 Mar 2026 10:33:12 +0100
Subject: [PATCH 42/50] v4l2loopback: use substituteInPlace --replace-fail

---
 pkgs/os-specific/linux/v4l2loopback/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index 418efb57d438..475c212fd67e 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   preBuild = ''
-    substituteInPlace Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install"
+    substituteInPlace Makefile --replace-fail "modules_install" "INSTALL_MOD_PATH=$out modules_install"
     sed -i '/depmod/d' Makefile
   '';
 

From 21cbaf5572e7c3d18a13df7d22951b6aba624712 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 6 Mar 2026 09:45:20 +0000
Subject: [PATCH 43/50] radicle-ci-broker: 0.25.0 -> 0.26.0

Changelog: https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:zwTxygwuz5LDGBq255RA2CbNGrz8/tree/NEWS.md
---
 pkgs/by-name/ra/radicle-ci-broker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-ci-broker/package.nix b/pkgs/by-name/ra/radicle-ci-broker/package.nix
index 07f74a9cb9c6..ccafa6032a3c 100644
--- a/pkgs/by-name/ra/radicle-ci-broker/package.nix
+++ b/pkgs/by-name/ra/radicle-ci-broker/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radicle-ci-broker";
-  version = "0.25.0";
+  version = "0.26.0";
 
   src = fetchFromRadicle {
     seed = "seed.radicle.xyz";
     repo = "zwTxygwuz5LDGBq255RA2CbNGrz8";
     node = "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-28PS85ME0Yg6+FnYw8GRNeo56z5efAqSE7FNk7wiTuI=";
+    hash = "sha256-ns2X+XD1AL7vo9fsAm1WTj/HRBmZ9eJhIH/WYF+j4uM=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git_head
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
   };
 
-  cargoHash = "sha256-v+ax8DmXZFxYGYL7WaX5W/UIByuYcvkAMQIqpb6Emyw=";
+  cargoHash = "sha256-dMc11UB8qzP9uIF9eU+ScwCTmUS/6yLkRYfTxZYnCa0=";
 
   postPatch = ''
     substituteInPlace build.rs \

From 7bb34b14685787a17b7fbafe512261c52346eb0d Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 6 Mar 2026 09:45:18 +0000
Subject: [PATCH 44/50] radicle-job: 0.4.0 -> 0.5.1

Changelog: https://app.radicle.xyz/nodes/iris.radicle.xyz/rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M/tree/CHANGELOG.md
---
 pkgs/by-name/ra/radicle-job/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-job/package.nix b/pkgs/by-name/ra/radicle-job/package.nix
index 005817420272..bbbf3b3de996 100644
--- a/pkgs/by-name/ra/radicle-job/package.nix
+++ b/pkgs/by-name/ra/radicle-job/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radicle-job";
-  version = "0.4.0";
+  version = "0.5.1";
 
   src = fetchFromRadicle {
     seed = "iris.radicle.xyz";
     repo = "z2UcCU1LgMshWvXj6hXSDDrwB8q8M";
     tag = "releases/v${finalAttrs.version}";
-    hash = "sha256-EGNs0IOJSp5SMJ3tdGCxIAN6hvVFwWWUmXoB914jw3k=";
+    hash = "sha256-1gvOpdgnug46PUD+4LZF8u73L3XpQGMGZyQCvnYvkgE=";
   };
 
-  cargoHash = "sha256-+DD2cGfxN0rmFhCazEuRiv3JfLXIC4FjaYHmugCmk+g=";
+  cargoHash = "sha256-nRif/ab+7r9ODuZVXOnYbEDHiipFg91XjezS1OBYYb4=";
 
   nativeCheckInputs = [
     radicle-node

From 038080c840678b023b56a943f7e6350b1c787381 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2026 10:47:15 +0000
Subject: [PATCH 45/50] terraform-providers.spotinst_spotinst: 1.232.4 ->
 1.232.5

---
 .../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 003c979bccb2..4031f14c7fd6 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1247,11 +1247,11 @@
     "vendorHash": "sha256-EOr4Ps0IYYOtRq19tt87NFfCEvJTaFBGb5B4mKMll7c="
   },
   "spotinst_spotinst": {
-    "hash": "sha256-yDwEtptwNXu/IpoKUK98UkpivTgJaY1FfsshsVpaaOk=",
+    "hash": "sha256-dZStuj7YjSF9X5/AEkrZyqDT2l2orpV4jY6CJrXjOgA=",
     "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
     "owner": "spotinst",
     "repo": "terraform-provider-spotinst",
-    "rev": "v1.232.4",
+    "rev": "v1.232.5",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-Cj7RVITkFxIjAZAqHFhnoTa4lTZFXG22ny801g0Y+NE="
   },

From ca363a08a9be5ac34fc9fb85f471e54e505f0340 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Fri, 6 Mar 2026 11:50:26 +0100
Subject: [PATCH 46/50] various: switch buildRustPackage packages to finalAttrs
 pattern

this shouldn't create any rebuilds

the move was done with the following script
```fish
#!/usr/bin/env fish

# nix shell .#nixfmt nixpkgs#{nixf-diagnose,ripgrep,sd}

set base (git rev-parse HEAD)

set scope pkgs/by-name
set builder buildRustPackage

set files (rg --files-with-matches -F "$builder rec {" $scope | sort -u)

for file in $files
    echo $file
    sd -F "$builder rec {" "$builder (finalAttrs: {" $file
    # version
    sd -F 'version}' 'finalAttrs.version}' $file
    sd -F '${version' '${finalAttrs.version' $file
    sd -F '= version' '= finalAttrs.version' $file
    sd -F 'inherit version;' 'inherit (finalAttrs) version;' $file
    sd -F ' + version;' ' + finalAttrs.version;' $file
    sd 'replaceStrings (.*) version' 'replaceStrings $1 finalAttrs.version' $file
    sd -F 'splitVersion version' 'splitVersion finalAttrs.version' $file
    sd -F 'versionAtLeast version' 'versionAtLeast finalAttrs.version' $file
    sd 'versions\.([a-z]+) version' 'versions.$1 finalAttrs.version' $file
    # src
    sd -F 'src}' 'finalAttrs.src}' $file
    sd -F '${src' '${finalAttrs.src' $file
    sd -F '= src' '= finalAttrs.src' $file
    sd -F 'inherit src;' 'inherit (finalAttrs) src;' $file
    sd -F 'inherit (src' 'inherit (finalAttrs.src' $file
    # pname
    sd -F 'pname}' 'finalAttrs.pname}' $file
    sd -F '${pname' '${finalAttrs.pname' $file
    sd -F '= pname' '= finalAttrs.pname' $file
    sd -F 'inherit pname;' 'inherit (finalAttrs) pname;' $file
    # combinations
    sd -F 'inherit version src;' 'inherit (finalAttrs) version src;' $file
    sd -F 'inherit src version;' 'inherit (finalAttrs) src version;' $file
    sd -F 'inherit version pname;' 'inherit (finalAttrs) version pname;' $file
    sd -F 'inherit pname version;' 'inherit (finalAttrs) pname version;' $file
    sd -F 'inherit pname src version;' 'inherit (finalAttrs) pname src version;' $file
    sd -F 'inherit pname version src;' 'inherit (finalAttrs) pname version src;' $file
    sd -F 'inherit src pname version;' 'inherit (finalAttrs) src pname version;' $file
    sd -F 'inherit src version pname;' 'inherit (finalAttrs) src version pname;' $file
    sd -F 'inherit version pname src;' 'inherit (finalAttrs) version pname src;' $file
    sd -F 'inherit version src pname;' 'inherit (finalAttrs) version src pname;' $file
    # meta
    sd -F '${meta' '${finalAttrs.meta' $file
    sd -F '= meta' '= finalAttrs.meta' $file
    sd -F 'inherit (meta' 'inherit (finalAttrs.meta' $file
    # cargo
    sd -F 'cargoRoot}' 'finalAttrs.cargoRoot}' $file
    sd -F '${cargoRoot' '${finalAttrs.cargoRoot' $file
    sd -F '= cargoRoot' '= finalAttrs.cargoRoot' $file
    sd -F 'cargoBuildFlags}' 'finalAttrs.cargoBuildFlags}' $file
    sd -F '${cargoBuildFlags' '${finalAttrs.cargoBuildFlags' $file
    sd -F '= cargoBuildFlags' '= finalAttrs.cargoBuildFlags' $file
    # patches
    sd -F 'patches}' 'finalAttrs.patches}' $file
    sd -F '${patches' '${finalAttrs.patches' $file
    sd -F '= patches' '= finalAttrs.patches' $file
    # passthru
    sd -F 'passthru}' 'finalAttrs.passthru}' $file
    sd -F '${passthru' '${finalAttrs.passthru' $file
    sd -F '= passthru' '= finalAttrs.passthru' $file
    # *buildInputs
    sd -F 'buildInputs}' 'finalAttrs.buildInputs}' $file
    sd -F 'makeLibraryPath buildInputs' 'makeLibraryPath finalAttrs.buildInputs' $file
    sd -F 'nativeBuildInputs}' 'finalAttrs.nativeBuildInputs}' $file
    sd -F 'propagatedBuildInputs}' 'finalAttrs.propagatedBuildInputs}' $file
    # other
    sd -F 'desktopItem}' 'finalAttrs.desktopItem}' $file
    sd -F 'runtimeLibs}' 'finalAttrs.runtimeLibs}' $file
    sd -F 'libPath}' 'finalAttrs.libPath}' $file
    sd -F 'runtimeDependencies}' 'finalAttrs.runtimeDependencies}' $file
    sd -F 'nativeRuntimeInputs}' 'finalAttrs.nativeRuntimeInputs}' $file
    sd -F '(!doCheck)' '(!finalAttrs.doCheck)' $file
    sd -F 'optional doCheck' 'optional finalAttrs.doCheck' $file
    sd -F 'optionals doCheck' 'optionals finalAttrs.doCheck' $file
    sd -F '++ runtimeDependencies' '++ finalAttrs.runtimeDependencies' $file
    # close finalAttrs lambda
    echo ')' >>$file
    # catch some errors early
    if ! nixfmt $file
        git restore $file
        continue
    end
    if ! nixf-diagnose -i sema-primop-overridden $file
        git restore $file
        continue
    end
end

set torestore (rg -F .finalAttrs --files-with-matches $scope)
if test (count $torestore) -gt 0
    git restore $torestore
end
# set torestore (rg -F finalAttrs.pname --files-with-matches $scope)
# if test (count $torestore) -gt 0
#     git restore $torestore
# end

# commit for faster eval times
git add pkgs
git commit --no-gpg-sign -m temp
set torestore

for file in $files
    # file hasn't changed
    if git diff --quiet $base $file
        continue
    end
    # try to eval the package to definitely catch all errors
    echo $file
    set pname (string split / $file -f 4)
    if ! nix eval .#$pname
        set torestore $torestore $file
    end
end

# restore files that don't eval
git reset --soft $base
git restore --staged .
if test (count $torestore) -gt 0
    git restore $torestore
end
```

after that some manual cleanup was done:
- restore all files that cause merge conflicts with staging

# Conflicts:
#	pkgs/by-name/ca/cargo-chef/package.nix
#	pkgs/by-name/ca/cargo-public-api/package.nix
#	pkgs/by-name/ca/cargo-update/package.nix
#	pkgs/by-name/le/leetcode-cli/package.nix
---
 pkgs/by-name/am/amdgpu_top/package.nix           |  8 ++++----
 pkgs/by-name/an/ansi/package.nix                 |  6 +++---
 pkgs/by-name/ap/apkeep/package.nix               |  8 ++++----
 pkgs/by-name/as/asahi-bless/package.nix          |  8 ++++----
 pkgs/by-name/as/asahi-btsync/package.nix         |  8 ++++----
 pkgs/by-name/as/asahi-nvram/package.nix          |  8 ++++----
 pkgs/by-name/as/asahi-wifisync/package.nix       |  8 ++++----
 pkgs/by-name/as/asciinema-scenario/package.nix   |  6 +++---
 pkgs/by-name/au/authoscope/package.nix           | 10 +++++-----
 pkgs/by-name/ba/bao/package.nix                  |  8 ++++----
 pkgs/by-name/bk/bk/package.nix                   |  6 +++---
 pkgs/by-name/bo/book-summary/package.nix         |  6 +++---
 pkgs/by-name/ca/cargo-all-features/package.nix   |  6 +++---
 pkgs/by-name/ca/cargo-apk/package.nix            |  6 +++---
 pkgs/by-name/ca/cargo-audit/package.nix          |  8 ++++----
 pkgs/by-name/ca/cargo-bazel/package.nix          |  6 +++---
 pkgs/by-name/ca/cargo-binutils/package.nix       |  8 ++++----
 pkgs/by-name/ca/cargo-bolero/package.nix         |  6 +++---
 pkgs/by-name/ca/cargo-c/package.nix              | 10 +++++-----
 pkgs/by-name/ca/cargo-chef/package.nix           |  6 +++---
 pkgs/by-name/ca/cargo-cyclonedx/package.nix      |  6 +++---
 pkgs/by-name/ca/cargo-gra/package.nix            |  6 +++---
 pkgs/by-name/ca/cargo-hf2/package.nix            |  6 +++---
 pkgs/by-name/ca/cargo-license/package.nix        |  6 +++---
 pkgs/by-name/ca/cargo-lock/package.nix           |  8 ++++----
 pkgs/by-name/ca/cargo-mommy/package.nix          |  6 +++---
 pkgs/by-name/ca/cargo-public-api/package.nix     |  8 ++++----
 pkgs/by-name/ca/cargo-rail/package.nix           |  8 ++++----
 pkgs/by-name/ca/cargo-run-bin/package.nix        |  8 ++++----
 pkgs/by-name/ca/cargo-tally/package.nix          |  8 ++++----
 pkgs/by-name/ca/cargo-toml-lint/package.nix      |  8 ++++----
 pkgs/by-name/ca/cargo-ui/package.nix             |  8 ++++----
 .../by-name/ca/cargo-unused-features/package.nix |  6 +++---
 pkgs/by-name/ca/cargo-update/package.nix         |  8 ++++----
 pkgs/by-name/ca/cargo-workspaces/package.nix     |  8 ++++----
 pkgs/by-name/ca/cargo2junit/package.nix          |  6 +++---
 pkgs/by-name/cf/cfonts/package.nix               |  6 +++---
 pkgs/by-name/ch/changelogging/package.nix        |  8 ++++----
 pkgs/by-name/ch/checkpwn/package.nix             |  8 ++++----
 pkgs/by-name/ch/cherrybomb/package.nix           |  8 ++++----
 pkgs/by-name/ci/citron/package.nix               |  6 +++---
 pkgs/by-name/cl/clang-tidy-sarif/package.nix     |  6 +++---
 pkgs/by-name/cl/clini/package.nix                |  6 +++---
 pkgs/by-name/cl/clippy-sarif/package.nix         |  6 +++---
 pkgs/by-name/co/colmena/package.nix              | 10 +++++-----
 pkgs/by-name/co/color-lsp/package.nix            |  6 +++---
 pkgs/by-name/cs/csv2svg/package.nix              |  6 +++---
 pkgs/by-name/di/diffedit3/package.nix            |  6 +++---
 pkgs/by-name/do/dotenvy/package.nix              |  6 +++---
 pkgs/by-name/do/dotslash/package.nix             |  6 +++---
 pkgs/by-name/du/duckscript/package.nix           |  6 +++---
 pkgs/by-name/el/elf2uf2-rs/package.nix           |  6 +++---
 pkgs/by-name/ev/eva/package.nix                  |  6 +++---
 pkgs/by-name/ew/eww/package.nix                  |  6 +++---
 pkgs/by-name/fa/faketty/package.nix              |  8 ++++----
 pkgs/by-name/fl/flowgger/package.nix             |  6 +++---
 pkgs/by-name/fo/fortanix-sgx-tools/package.nix   |  6 +++---
 pkgs/by-name/fr/frawk/package.nix                |  8 ++++----
 pkgs/by-name/fr/french-numbers/package.nix       |  6 +++---
 pkgs/by-name/ge/gel/package.nix                  |  8 ++++----
 pkgs/by-name/ge/genemichaels/package.nix         |  6 +++---
 pkgs/by-name/gh/gh-cal/package.nix               |  6 +++---
 pkgs/by-name/gi/gitlab-timelogs/package.nix      |  8 ++++----
 pkgs/by-name/gl/globe-cli/package.nix            |  6 +++---
 pkgs/by-name/gp/gpustat/package.nix              |  8 ++++----
 pkgs/by-name/gr/grass-sass/package.nix           |  8 ++++----
 pkgs/by-name/ha/habitat/package.nix              | 10 +++++-----
 pkgs/by-name/ha/hadolint-sarif/package.nix       |  6 +++---
 pkgs/by-name/ha/halloy/package.nix               | 16 ++++++++--------
 pkgs/by-name/ha/hayagriva/package.nix            |  8 ++++----
 pkgs/by-name/hu/huniq/package.nix                |  6 +++---
 pkgs/by-name/hv/hvm/package.nix                  |  6 +++---
 pkgs/by-name/i3/i3-open-next-ws/package.nix      |  6 +++---
 pkgs/by-name/in/inputplug/package.nix            |  6 +++---
 pkgs/by-name/jf/jfmt/package.nix                 | 10 +++++-----
 pkgs/by-name/ju/just-formatter/package.nix       |  6 +++---
 pkgs/by-name/ke/keepass-diff/package.nix         |  6 +++---
 pkgs/by-name/ki/kind2/package.nix                |  6 +++---
 pkgs/by-name/kr/krabby/package.nix               |  8 ++++----
 pkgs/by-name/le/lemmeknow/package.nix            |  8 ++++----
 pkgs/by-name/li/license-generator/package.nix    |  6 +++---
 pkgs/by-name/lo/loco/package.nix                 |  6 +++---
 pkgs/by-name/ls/lscolors/package.nix             |  8 ++++----
 pkgs/by-name/md/mdbook-katex/package.nix         |  8 ++++----
 pkgs/by-name/md/mdbook-pdf/package.nix           |  8 ++++----
 pkgs/by-name/md/mdevctl/package.nix              |  6 +++---
 pkgs/by-name/me/meow/package.nix                 |  8 ++++----
 pkgs/by-name/mo/movine/package.nix               |  6 +++---
 pkgs/by-name/ne/nethoscope/package.nix           | 12 ++++++------
 pkgs/by-name/nf/nflz/package.nix                 |  6 +++---
 pkgs/by-name/ni/nix-template/package.nix         | 10 +++++-----
 pkgs/by-name/oc/oculante/package.nix             |  8 ++++----
 pkgs/by-name/ov/overlayed/package.nix            | 10 +++++-----
 pkgs/by-name/pa/paging-calculator/package.nix    |  8 ++++----
 pkgs/by-name/pa/panamax/package.nix              |  6 +++---
 pkgs/by-name/pe/perseus-cli/package.nix          |  6 +++---
 pkgs/by-name/pi/pijul/package.nix                |  6 +++---
 pkgs/by-name/pi/pipe-rename/package.nix          |  6 +++---
 pkgs/by-name/pr/preserves-tools/package.nix      |  6 +++---
 pkgs/by-name/pr/probe-rs-tools/package.nix       | 10 +++++-----
 pkgs/by-name/pr/process-viewer/package.nix       |  6 +++---
 .../pr/prometheus-wireguard-exporter/package.nix |  6 +++---
 .../pr/protoc-gen-prost-crate/package.nix        |  6 +++---
 .../pr/protoc-gen-prost-serde/package.nix        |  6 +++---
 pkgs/by-name/pr/protoc-gen-prost/package.nix     |  6 +++---
 pkgs/by-name/pr/protoc-gen-tonic/package.nix     |  6 +++---
 pkgs/by-name/pr/protox/package.nix               |  8 ++++----
 pkgs/by-name/pu/pulldown-cmark/package.nix       |  6 +++---
 pkgs/by-name/ra/rav1e/package.nix                |  8 ++++----
 pkgs/by-name/ra/ravedude/package.nix             |  8 ++++----
 pkgs/by-name/re/regex-cli/package.nix            |  6 +++---
 pkgs/by-name/re/reshape/package.nix              |  8 ++++----
 pkgs/by-name/re/restic-browser/package.nix       | 16 ++++++++--------
 pkgs/by-name/rs/rsign2/package.nix               |  6 +++---
 pkgs/by-name/rs/rsonpath/package.nix             |  8 ++++----
 pkgs/by-name/ru/rust-audit-info/package.nix      |  6 +++---
 pkgs/by-name/ru/rustfinity/package.nix           |  6 +++---
 pkgs/by-name/ru/rustycli/package.nix             |  8 ++++----
 pkgs/by-name/sa/safe-rm/package.nix              |  6 +++---
 pkgs/by-name/sa/samply/package.nix               |  8 ++++----
 pkgs/by-name/sa/sarif-fmt/package.nix            |  6 +++---
 pkgs/by-name/se/sea-orm-cli/package.nix          |  6 +++---
 pkgs/by-name/sg/sgxs-tools/package.nix           |  6 +++---
 pkgs/by-name/sh/shellcheck-sarif/package.nix     |  6 +++---
 pkgs/by-name/si/sigi/package.nix                 |  6 +++---
 pkgs/by-name/sl/slimevr/package.nix              | 14 +++++++-------
 pkgs/by-name/sp/specr-transpile/package.nix      |  6 +++---
 pkgs/by-name/sp/spr/package.nix                  |  6 +++---
 pkgs/by-name/ss/ssh-agent-switcher/package.nix   |  8 ++++----
 pkgs/by-name/st/star-history/package.nix         |  6 +++---
 pkgs/by-name/st/starry/package.nix               |  6 +++---
 pkgs/by-name/su/sudachi-rs/package.nix           | 10 +++++-----
 pkgs/by-name/sv/svd2rust/package.nix             |  8 ++++----
 pkgs/by-name/sv/svdtools/package.nix             |  8 ++++----
 pkgs/by-name/sv/svlint/package.nix               |  8 ++++----
 pkgs/by-name/sw/swayr/package.nix                |  8 ++++----
 pkgs/by-name/sw/swayrbar/package.nix             |  8 ++++----
 pkgs/by-name/sy/syndicate-server/package.nix     |  6 +++---
 pkgs/by-name/ta/talecast/package.nix             |  6 +++---
 pkgs/by-name/te/termimage/package.nix            |  8 ++++----
 pkgs/by-name/te/textplots/package.nix            |  6 +++---
 pkgs/by-name/to/toipe/package.nix                |  6 +++---
 pkgs/by-name/to/toml2json/package.nix            |  6 +++---
 pkgs/by-name/tr/trashy/package.nix               |  8 ++++----
 pkgs/by-name/tr/treedome/package.nix             | 14 +++++++-------
 pkgs/by-name/tt/ttfb/package.nix                 |  8 ++++----
 pkgs/by-name/tu/tuifeed/package.nix              |  6 +++---
 pkgs/by-name/tw/twiggy/package.nix               |  6 +++---
 pkgs/by-name/ty/typst-live/package.nix           |  6 +++---
 pkgs/by-name/un/unpfs/package.nix                | 10 +++++-----
 pkgs/by-name/vo/vopono/package.nix               |  6 +++---
 pkgs/by-name/vr/vrc-get/package.nix              |  6 +++---
 pkgs/by-name/wa/wambo/package.nix                |  8 ++++----
 pkgs/by-name/wc/wchisp/package.nix               |  8 ++++----
 pkgs/by-name/we/wezterm/package.nix              | 10 +++++-----
 pkgs/by-name/wh/when-cli/package.nix             |  6 +++---
 pkgs/by-name/wi/wiremix/package.nix              |  6 +++---
 pkgs/by-name/wl/wleave/package.nix               | 10 +++++-----
 pkgs/by-name/wl/wlink/package.nix                |  8 ++++----
 pkgs/by-name/wy/wyvern/package.nix               |  6 +++---
 pkgs/by-name/xq/xq/package.nix                   |  6 +++---
 pkgs/by-name/zb/zbus-xmlgen/package.nix          |  6 +++---
 pkgs/by-name/zi/zine/package.nix                 |  8 ++++----
 163 files changed, 590 insertions(+), 590 deletions(-)

diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix
index d7d2b29079bf..b56bfde91e81 100644
--- a/pkgs/by-name/am/amdgpu_top/package.nix
+++ b/pkgs/by-name/am/amdgpu_top/package.nix
@@ -14,14 +14,14 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "amdgpu_top";
   version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "Umio-Yasuno";
     repo = "amdgpu_top";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-yw73bKO91O05WBQNwjcQ+AqxYgGXXC7XJzUnMx5/IWc=";
   };
 
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   postFixup = ''
-    patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/${pname}
+    patchelf --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" $out/bin/${finalAttrs.pname}
   '';
 
   passthru.updateScript = nix-update-script { };
@@ -62,4 +62,4 @@ rustPlatform.buildRustPackage rec {
     platforms = lib.platforms.linux;
     mainProgram = "amdgpu_top";
   };
-}
+})
diff --git a/pkgs/by-name/an/ansi/package.nix b/pkgs/by-name/an/ansi/package.nix
index 6018ba5ad953..5441ac127b4a 100644
--- a/pkgs/by-name/an/ansi/package.nix
+++ b/pkgs/by-name/an/ansi/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ansi-escape-sequences-cli";
   version = "0.2.2";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-55CdEw1bVgabWRbZIRe9jytwDf70Y92nITwDRQaTXaQ=";
   };
 
@@ -26,4 +26,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ phip1611 ];
     mainProgram = "ansi";
   };
-}
+})
diff --git a/pkgs/by-name/ap/apkeep/package.nix b/pkgs/by-name/ap/apkeep/package.nix
index 05f480b418e2..06a389193cb0 100644
--- a/pkgs/by-name/ap/apkeep/package.nix
+++ b/pkgs/by-name/ap/apkeep/package.nix
@@ -6,12 +6,12 @@
   pkg-config,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "apkeep";
   version = "0.18.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Sk8CQaMXtPPJh2nGgGthyzuvkVViQ0jtqPjAqo2dtpg=";
   };
 
@@ -32,9 +32,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Command-line tool for downloading APK files from various sources";
     homepage = "https://github.com/EFForg/apkeep";
-    changelog = "https://github.com/EFForg/apkeep/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/EFForg/apkeep/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "apkeep";
   };
-}
+})
diff --git a/pkgs/by-name/as/asahi-bless/package.nix b/pkgs/by-name/as/asahi-bless/package.nix
index f7127f9e2858..00edbc973005 100644
--- a/pkgs/by-name/as/asahi-bless/package.nix
+++ b/pkgs/by-name/as/asahi-bless/package.nix
@@ -4,17 +4,17 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "asahi-bless";
   version = "0.4.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-SNaA+CEuCBwo4c54qWGs5AdkBYb9IWY1cQ0dRd/noe8=";
   };
 
   cargoHash = "sha256-nfSJ9RkzFAWlxlfoUKk8ZmIXDJXoSyHCGgRgMy9FDkw=";
-  cargoDepsName = pname;
+  cargoDepsName = finalAttrs.pname;
 
   meta = {
     description = "Tool to select active boot partition on ARM Macs";
@@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "asahi-bless";
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/as/asahi-btsync/package.nix b/pkgs/by-name/as/asahi-btsync/package.nix
index 86093c310485..f60c1a8d5174 100644
--- a/pkgs/by-name/as/asahi-btsync/package.nix
+++ b/pkgs/by-name/as/asahi-btsync/package.nix
@@ -4,17 +4,17 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "asahi-btsync";
   version = "0.2.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-jp05WcwY1cWh4mBQj+3jRCZoG32OhDvTB84hOAGemX8=";
   };
 
   cargoHash = "sha256-gGWhi0T7xDIsbzfw/KL3TSneLvQaiz/2xbpHeZt1i3I=";
-  cargoDepsName = pname;
+  cargoDepsName = finalAttrs.pname;
 
   meta = {
     description = "Tool to sync Bluetooth pairing keys with macos on ARM Macs";
@@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "asahi-btsync";
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/as/asahi-nvram/package.nix b/pkgs/by-name/as/asahi-nvram/package.nix
index 779866ec040a..555a30bf00f8 100644
--- a/pkgs/by-name/as/asahi-nvram/package.nix
+++ b/pkgs/by-name/as/asahi-nvram/package.nix
@@ -4,17 +4,17 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "asahi-nvram";
   version = "0.2.3";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-zfUvPHAPrYhzgeiirGuqZaWnLBH0PHsqOUy2e972bWM=";
   };
 
   cargoHash = "sha256-NW/puo/Xoum7DjSQjBgilQcKbY3mAfVgXxUK6+1H1JI=";
-  cargoDepsName = pname;
+  cargoDepsName = finalAttrs.pname;
 
   meta = {
     description = "Tool to read and write nvram variables on ARM Macs";
@@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "asahi-nvram";
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/as/asahi-wifisync/package.nix b/pkgs/by-name/as/asahi-wifisync/package.nix
index 45257bc7ca54..d09fb0020e30 100644
--- a/pkgs/by-name/as/asahi-wifisync/package.nix
+++ b/pkgs/by-name/as/asahi-wifisync/package.nix
@@ -4,17 +4,17 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "asahi-wifisync";
   version = "0.2.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-wKd6rUUnegvl6cHODVQlllaOXuAGlmwx9gr73I/2l/c=";
   };
 
   cargoHash = "sha256-ZxgRxQyDID3mBpr8dhHScctk14Pm9V51Gn24d24JyVk=";
-  cargoDepsName = pname;
+  cargoDepsName = finalAttrs.pname;
 
   meta = {
     description = "Tool to sync Wifi passwords with macos on ARM Macs";
@@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "asahi-wifisync";
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/as/asciinema-scenario/package.nix b/pkgs/by-name/as/asciinema-scenario/package.nix
index 825d4a0aacad..4b4e869f0119 100644
--- a/pkgs/by-name/as/asciinema-scenario/package.nix
+++ b/pkgs/by-name/as/asciinema-scenario/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "asciinema-scenario";
   version = "0.3.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-fnX5CIYLdFqi04PQPVIAYDGn+xXi016l8pPcIrYIhmQ=";
   };
 
@@ -21,4 +21,4 @@ rustPlatform.buildRustPackage rec {
     license = with lib.licenses; [ mit ];
     mainProgram = "asciinema-scenario";
   };
-}
+})
diff --git a/pkgs/by-name/au/authoscope/package.nix b/pkgs/by-name/au/authoscope/package.nix
index ffb127a47281..33f69185e491 100644
--- a/pkgs/by-name/au/authoscope/package.nix
+++ b/pkgs/by-name/au/authoscope/package.nix
@@ -10,14 +10,14 @@
   zlib,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "authoscope";
   version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = "authoscope";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk=";
   };
 
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   postInstall = ''
-    installManPage docs/${pname}.1
+    installManPage docs/${finalAttrs.pname}.1
   '';
 
   # Tests requires access to httpin.org
@@ -46,8 +46,8 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Scriptable network authentication cracker";
     homepage = "https://github.com/kpcyrd/authoscope";
-    changelog = "https://github.com/kpcyrd/authoscope/releases/tag/v${version}";
+    changelog = "https://github.com/kpcyrd/authoscope/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/by-name/ba/bao/package.nix b/pkgs/by-name/ba/bao/package.nix
index f5ff37553f54..b6bd08820396 100644
--- a/pkgs/by-name/ba/bao/package.nix
+++ b/pkgs/by-name/ba/bao/package.nix
@@ -4,13 +4,13 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bao";
   version = "0.13.1";
 
   src = fetchCrate {
-    inherit version;
-    pname = "${pname}_bin";
+    inherit (finalAttrs) version;
+    pname = "${finalAttrs.pname}_bin";
     hash = "sha256-8h5otpu3z2Hgy0jMCITJNr8Q4iVdlR5Lea2X+WuenWs=";
   };
 
@@ -26,4 +26,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "bao";
   };
-}
+})
diff --git a/pkgs/by-name/bk/bk/package.nix b/pkgs/by-name/bk/bk/package.nix
index f7d7489e5aff..1f80a6d9be2d 100644
--- a/pkgs/by-name/bk/bk/package.nix
+++ b/pkgs/by-name/bk/bk/package.nix
@@ -6,12 +6,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bk";
   version = "0.6.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-rSMvx/zUZqRRgj48TVVG7RwQT8e70m0kertRJysDY4Y=";
   };
 
@@ -39,4 +39,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ vuimuich ];
     mainProgram = "bk";
   };
-}
+})
diff --git a/pkgs/by-name/bo/book-summary/package.nix b/pkgs/by-name/bo/book-summary/package.nix
index af508d86bee9..ef293a300f6f 100644
--- a/pkgs/by-name/bo/book-summary/package.nix
+++ b/pkgs/by-name/bo/book-summary/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "book-summary";
   version = "0.2.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-dxM6bqgHp4IaG03NriHvoT3al2u5Sz/I5ajlgzpjG1c=";
   };
 
@@ -21,4 +21,4 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/dvogt23/book-summary";
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-all-features/package.nix b/pkgs/by-name/ca/cargo-all-features/package.nix
index 58abcbd4ae39..a8ff6f785845 100644
--- a/pkgs/by-name/ca/cargo-all-features/package.nix
+++ b/pkgs/by-name/ca/cargo-all-features/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-all-features";
   version = "1.12.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-pD0lyI2zSOeEDk1Lch4Qf5mo8Z8Peiy2XF5iQ62vsaI=";
   };
 
@@ -31,4 +31,4 @@ rustPlatform.buildRustPackage rec {
       matthiasbeyer
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-apk/package.nix b/pkgs/by-name/ca/cargo-apk/package.nix
index 33638f035fc5..148de073aeb5 100644
--- a/pkgs/by-name/ca/cargo-apk/package.nix
+++ b/pkgs/by-name/ca/cargo-apk/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-apk";
   version = "0.9.6";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-1vCrM+0SNefd7FrRXnSjLhM3/MSVJfcL4k1qAstX+/A=";
   };
 
@@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [ nickcao ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-audit/package.nix b/pkgs/by-name/ca/cargo-audit/package.nix
index 87efa3ecb51c..fd6fc312778d 100644
--- a/pkgs/by-name/ca/cargo-audit/package.nix
+++ b/pkgs/by-name/ca/cargo-audit/package.nix
@@ -7,12 +7,12 @@
   zlib,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-audit";
   version = "0.22.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Ha2yVyu9331NaqiW91NEwCTIeW+3XPiqZzmatN5KOws=";
   };
 
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
     description = "Audit Cargo.lock files for crates with security vulnerabilities";
     mainProgram = "cargo-audit";
     homepage = "https://rustsec.org";
-    changelog = "https://github.com/rustsec/rustsec/blob/cargo-audit/v${version}/cargo-audit/CHANGELOG.md";
+    changelog = "https://github.com/rustsec/rustsec/blob/cargo-audit/v${finalAttrs.version}/cargo-audit/CHANGELOG.md";
     license = with lib.licenses; [
       mit # or
       asl20
@@ -46,4 +46,4 @@ rustPlatform.buildRustPackage rec {
       jk
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-bazel/package.nix b/pkgs/by-name/ca/cargo-bazel/package.nix
index 795a3e6a1d21..4b206b6c04d6 100644
--- a/pkgs/by-name/ca/cargo-bazel/package.nix
+++ b/pkgs/by-name/ca/cargo-bazel/package.nix
@@ -6,12 +6,12 @@
   libz,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-bazel";
   version = "0.17.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-KWcxZxzDbiBfBpr37M6HoqHMCYXq6sTVxU9KR3PIiJc=";
   };
 
@@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ rickvanprim ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-binutils/package.nix b/pkgs/by-name/ca/cargo-binutils/package.nix
index b6905c4a2a02..8b773c5b1e70 100644
--- a/pkgs/by-name/ca/cargo-binutils/package.nix
+++ b/pkgs/by-name/ca/cargo-binutils/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-binutils";
   version = "0.4.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-AF1MRBH8ULnHNHT2FS/LxMH+b06QMTIZMIR8mmkn17c=";
   };
 
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
       In order for this to work, you either need to run `rustup component add llvm-tools` or install the `llvm-tools` component using your Nix library (e.g. fenix or rust-overlay)
     '';
     homepage = "https://github.com/rust-embedded/cargo-binutils";
-    changelog = "https://github.com/rust-embedded/cargo-binutils/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/rust-embedded/cargo-binutils/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       asl20
       mit
@@ -32,4 +32,4 @@ rustPlatform.buildRustPackage rec {
       newam
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-bolero/package.nix b/pkgs/by-name/ca/cargo-bolero/package.nix
index 15a37cd59700..55e26723c9c4 100644
--- a/pkgs/by-name/ca/cargo-bolero/package.nix
+++ b/pkgs/by-name/ca/cargo-bolero/package.nix
@@ -8,12 +8,12 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-bolero";
   version = "0.13.4";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-lfBpHaY2UCBMg45S4IW8fcpkGkKJoT4qqR2yq5KiXuE=";
   };
 
@@ -36,4 +36,4 @@ rustPlatform.buildRustPackage rec {
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ ekleog ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-c/package.nix b/pkgs/by-name/ca/cargo-c/package.nix
index ce4cb935bcbc..effa2325438f 100644
--- a/pkgs/by-name/ca/cargo-c/package.nix
+++ b/pkgs/by-name/ca/cargo-c/package.nix
@@ -14,13 +14,13 @@ let
   # this version may need to be updated along with package version
   cargoVersion = "0.93.0";
 in
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-c";
   version = "0.10.19";
 
   src = fetchCrate {
-    inherit pname;
-    version = "${version}+cargo-${cargoVersion}";
+    inherit (finalAttrs) pname;
+    version = "${finalAttrs.version}+cargo-${cargoVersion}";
     hash = "sha256-PrBmB+0tmU2MAUnRr+wx4g9hu0Y9i6WfR8U89bwiLVY=";
   };
 
@@ -63,11 +63,11 @@ rustPlatform.buildRustPackage rec {
       to be used by any C (and C-compatible) software.
     '';
     homepage = "https://github.com/lu-zero/cargo-c";
-    changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${version}";
+    changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       cpu
       matthiasbeyer
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-chef/package.nix b/pkgs/by-name/ca/cargo-chef/package.nix
index e3b19a86c32d..a5fb2f0c576a 100644
--- a/pkgs/by-name/ca/cargo-chef/package.nix
+++ b/pkgs/by-name/ca/cargo-chef/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-chef";
   version = "0.1.75";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-FETYJrx5+yNOzMVIgJQ0yNLi2PB7cA128n8hAXIhx3E=";
   };
 
@@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ kkharji ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-cyclonedx/package.nix b/pkgs/by-name/ca/cargo-cyclonedx/package.nix
index c265434b9825..b0335bf0799d 100644
--- a/pkgs/by-name/ca/cargo-cyclonedx/package.nix
+++ b/pkgs/by-name/ca/cargo-cyclonedx/package.nix
@@ -8,14 +8,14 @@
   curl,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-cyclonedx";
   version = "0.5.7";
 
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-rust-cargo";
-    rev = "${pname}-${version}";
+    rev = "${finalAttrs.pname}-${finalAttrs.version}";
     hash = "sha256-T/9eHI2P8eCZAqMTeZz1yEi5nljQWfHrdNiU3h3h74U=";
   };
 
@@ -49,4 +49,4 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ nikstur ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-gra/package.nix b/pkgs/by-name/ca/cargo-gra/package.nix
index ae989ce3e263..9a0bc8e5663d 100644
--- a/pkgs/by-name/ca/cargo-gra/package.nix
+++ b/pkgs/by-name/ca/cargo-gra/package.nix
@@ -4,12 +4,12 @@
   lib,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-gra";
   version = "0.6.2";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-JbBcpp/E3WlQrwdxMsbSdmIEnDTQj/1XDwAWJsniRu0=";
   };
 
@@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ bot-wxt1221 ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-hf2/package.nix b/pkgs/by-name/ca/cargo-hf2/package.nix
index d588c3ee32d8..9127e8b0e084 100644
--- a/pkgs/by-name/ca/cargo-hf2/package.nix
+++ b/pkgs/by-name/ca/cargo-hf2/package.nix
@@ -6,12 +6,12 @@
   libusb1,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-hf2";
   version = "0.3.3";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-0o3j7YfgNNnfbrv9Gppo24DqYlDCxhtsJHIhAV214DU=";
   };
 
@@ -28,4 +28,4 @@ rustPlatform.buildRustPackage rec {
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ astrobeastie ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-license/package.nix b/pkgs/by-name/ca/cargo-license/package.nix
index 71d1ffee7ee2..ff18e5aaa5f2 100644
--- a/pkgs/by-name/ca/cargo-license/package.nix
+++ b/pkgs/by-name/ca/cargo-license/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-license";
   version = "0.7.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-bOBrjChkQM6POZZn53JmJcIn1x+ygF5mthZihMskxIk=";
   };
 
@@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec {
       matthiasbeyer
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-lock/package.nix b/pkgs/by-name/ca/cargo-lock/package.nix
index 8140b02e7c42..4057181239de 100644
--- a/pkgs/by-name/ca/cargo-lock/package.nix
+++ b/pkgs/by-name/ca/cargo-lock/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-lock";
   version = "11.0.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Gz459c2IWD19RGBg2TyHbI/VNCelha+R0FeNkAaHksU=";
   };
 
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "Self-contained Cargo.lock parser with graph analysis";
     mainProgram = "cargo-lock";
     homepage = "https://github.com/rustsec/rustsec/tree/main/cargo-lock";
-    changelog = "https://github.com/rustsec/rustsec/blob/cargo-lock/v${version}/cargo-lock/CHANGELOG.md";
+    changelog = "https://github.com/rustsec/rustsec/blob/cargo-lock/v${finalAttrs.version}/cargo-lock/CHANGELOG.md";
     license = with lib.licenses; [
       asl20 # or
       mit
@@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec {
       matthiasbeyer
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-mommy/package.nix b/pkgs/by-name/ca/cargo-mommy/package.nix
index 21c85ae6f273..bebaaee671e8 100644
--- a/pkgs/by-name/ca/cargo-mommy/package.nix
+++ b/pkgs/by-name/ca/cargo-mommy/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-mommy";
   version = "0.3.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-2WR6xUYL/bLgZlI4ADbPAtdLq0y4MoVP8Loxdu/58Wc=";
   };
 
@@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [ GoldsteinE ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix
index 177486c90f51..fb5fe7e22995 100644
--- a/pkgs/by-name/ca/cargo-public-api/package.nix
+++ b/pkgs/by-name/ca/cargo-public-api/package.nix
@@ -7,12 +7,12 @@
   openssl,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-public-api";
   version = "0.51.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-fnkoIXv6QYJPYtsLZldOEjOxke6YVDEds3jF5SGZGKE=";
   };
 
@@ -32,8 +32,8 @@ rustPlatform.buildRustPackage rec {
     description = "List and diff the public API of Rust library crates between releases and commits. Detect breaking API changes and semver violations";
     mainProgram = "cargo-public-api";
     homepage = "https://github.com/Enselic/cargo-public-api";
-    changelog = "https://github.com/Enselic/cargo-public-api/releases/tag/v${version}";
+    changelog = "https://github.com/Enselic/cargo-public-api/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-rail/package.nix b/pkgs/by-name/ca/cargo-rail/package.nix
index 864461fafb47..5ebb59b32ffe 100644
--- a/pkgs/by-name/ca/cargo-rail/package.nix
+++ b/pkgs/by-name/ca/cargo-rail/package.nix
@@ -7,12 +7,12 @@
   openssl,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-rail";
   version = "0.7.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-L8yh47lYvXVGOr8jDZ4Gk2rIfUnr88q9OR5/iDrJua0=";
   };
 
@@ -60,9 +60,9 @@ rustPlatform.buildRustPackage rec {
     description = "Graph-aware monorepo orchestration for Rust workspaces";
     mainProgram = "cargo-rail";
     homepage = "https://github.com/loadingalias/cargo-rail";
-    changelog = "https://github.com/loadingalias/cargo-rail/releases/tag/v${version}";
+    changelog = "https://github.com/loadingalias/cargo-rail/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-run-bin/package.nix b/pkgs/by-name/ca/cargo-run-bin/package.nix
index 13b7fecb6155..e93513c0a371 100644
--- a/pkgs/by-name/ca/cargo-run-bin/package.nix
+++ b/pkgs/by-name/ca/cargo-run-bin/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-run-bin";
   version = "1.7.4";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-79DJ6j2sai1dTdcXf0qD97TCNZuGRSUobLGahoApMss=";
   };
 
@@ -22,11 +22,11 @@ rustPlatform.buildRustPackage rec {
     description = "Build, cache, and run binaries scoped in Cargo.toml rather than installing globally. This acts similarly to npm run and gomodrun, and allows your teams to always be running the same tooling versions";
     mainProgram = "cargo-bin";
     homepage = "https://github.com/dustinblackman/cargo-run-bin";
-    changelog = "https://github.com/dustinblackman/cargo-run-bin/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/dustinblackman/cargo-run-bin/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       mightyiam
       matthiasbeyer
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix
index cbe27fcec99d..0f84275cf0d8 100644
--- a/pkgs/by-name/ca/cargo-tally/package.nix
+++ b/pkgs/by-name/ca/cargo-tally/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-tally";
   version = "1.0.73";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-aYVo/mI4YoohwxXoIL9vpuPN526sPnQMV1PnUqJEO2U=";
   };
 
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     description = "Graph the number of crates that depend on your crate over time";
     mainProgram = "cargo-tally";
     homepage = "https://github.com/dtolnay/cargo-tally";
-    changelog = "https://github.com/dtolnay/cargo-tally/releases/tag/${version}";
+    changelog = "https://github.com/dtolnay/cargo-tally/releases/tag/${finalAttrs.version}";
     license = with lib.licenses; [
       asl20 # or
       mit
@@ -28,4 +28,4 @@ rustPlatform.buildRustPackage rec {
       matthiasbeyer
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-toml-lint/package.nix b/pkgs/by-name/ca/cargo-toml-lint/package.nix
index 050940e3bf53..c92fe46f4cb7 100644
--- a/pkgs/by-name/ca/cargo-toml-lint/package.nix
+++ b/pkgs/by-name/ca/cargo-toml-lint/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-toml-lint";
   version = "0.1.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-U3y9gnFvkqJmyFqRAUQorJQY0iRzAE9UUXzFmgZIyaM=";
   };
 
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     description = "Simple linter for Cargo.toml manifests";
     mainProgram = "cargo-toml-lint";
     homepage = "https://github.com/fuellabs/cargo-toml-lint";
-    changelog = "https://github.com/fuellabs/cargo-toml-lint/releases/tag/v${version}";
+    changelog = "https://github.com/fuellabs/cargo-toml-lint/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [
       asl20 # or
       mit
@@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec {
       matthiasbeyer
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-ui/package.nix b/pkgs/by-name/ca/cargo-ui/package.nix
index 35f2618f79e1..c39fc868fd0a 100644
--- a/pkgs/by-name/ca/cargo-ui/package.nix
+++ b/pkgs/by-name/ca/cargo-ui/package.nix
@@ -16,12 +16,12 @@
   libxcb,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-ui";
   version = "0.3.3";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-M/ljgtTHMSc7rY/a8CpKGNuOSdVDwRt6+tzPPHdpKOw=";
   };
 
@@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec {
     description = "GUI for Cargo";
     mainProgram = "cargo-ui";
     homepage = "https://github.com/slint-ui/cargo-ui";
-    changelog = "https://github.com/slint-ui/cargo-ui/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/slint-ui/cargo-ui/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       mit
       asl20
@@ -74,4 +74,4 @@ rustPlatform.buildRustPackage rec {
       matthiasbeyer
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-unused-features/package.nix b/pkgs/by-name/ca/cargo-unused-features/package.nix
index a846e13f9193..5f1e77b5d509 100644
--- a/pkgs/by-name/ca/cargo-unused-features/package.nix
+++ b/pkgs/by-name/ca/cargo-unused-features/package.nix
@@ -8,12 +8,12 @@
   openssl,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-unused-features";
   version = "0.2.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-gdwIbbQDw/DgBV9zY2Rk/oWjPv1SS/+oFnocsMo2Axo=";
   };
 
@@ -43,4 +43,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "unused-features";
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix
index d36d2d4e44fd..1a40b3b8522b 100644
--- a/pkgs/by-name/ca/cargo-update/package.nix
+++ b/pkgs/by-name/ca/cargo-update/package.nix
@@ -14,12 +14,12 @@
   zlib,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-update";
   version = "18.1.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-q7o9CPz9d4cBkrrnp2JY4CZiYkKx/ebVlrS4D34RbIo=";
   };
 
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Cargo subcommand for checking and applying updates to installed executables";
     homepage = "https://github.com/nabijaczleweli/cargo-update";
-    changelog = "https://github.com/nabijaczleweli/cargo-update/releases/tag/v${version}";
+    changelog = "https://github.com/nabijaczleweli/cargo-update/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       gerschtli
@@ -71,4 +71,4 @@ rustPlatform.buildRustPackage rec {
       matthiasbeyer
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-workspaces/package.nix b/pkgs/by-name/ca/cargo-workspaces/package.nix
index 1d103eebe0ed..61273d48fab1 100644
--- a/pkgs/by-name/ca/cargo-workspaces/package.nix
+++ b/pkgs/by-name/ca/cargo-workspaces/package.nix
@@ -8,12 +8,12 @@
   zlib,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-workspaces";
   version = "0.4.2";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-/h7v5Wq7YsNMVzLHw3QQmcknbjARpI7HFPAUGX72wZ0=";
   };
 
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
       commands and more.
     '';
     homepage = "https://github.com/pksunkara/cargo-workspaces";
-    changelog = "https://github.com/pksunkara/cargo-workspaces/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/pksunkara/cargo-workspaces/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       macalinao
@@ -49,4 +49,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "cargo-workspaces";
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo2junit/package.nix b/pkgs/by-name/ca/cargo2junit/package.nix
index 3e4f10adaa6a..53621c16ef21 100644
--- a/pkgs/by-name/ca/cargo2junit/package.nix
+++ b/pkgs/by-name/ca/cargo2junit/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo2junit";
   version = "0.1.13";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-R3a87nXCnGhdeyR7409hFR5Cj3TFUWqaLNOtlXPsvto=";
   };
 
@@ -26,4 +26,4 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ alekseysidorov ];
   };
-}
+})
diff --git a/pkgs/by-name/cf/cfonts/package.nix b/pkgs/by-name/cf/cfonts/package.nix
index 48c0aa7f68b3..ab8e1c6b559d 100644
--- a/pkgs/by-name/cf/cfonts/package.nix
+++ b/pkgs/by-name/cf/cfonts/package.nix
@@ -3,12 +3,12 @@
   rustPlatform,
   fetchCrate,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cfonts";
   version = "1.3.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-rgdqQzJyb1/bYB3S1MD/53vdQ+GaxOvGHuPE6dxMRB0=";
   };
 
@@ -21,4 +21,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ leifhelm ];
     mainProgram = "cfonts";
   };
-}
+})
diff --git a/pkgs/by-name/ch/changelogging/package.nix b/pkgs/by-name/ch/changelogging/package.nix
index 36453e475290..8dd4af5e1d59 100644
--- a/pkgs/by-name/ch/changelogging/package.nix
+++ b/pkgs/by-name/ch/changelogging/package.nix
@@ -6,12 +6,12 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "changelogging";
   version = "0.7.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-orTUCBHacD0MQNfhOUWdh9RxT/9YNvgfCHFDr2eNQic=";
   };
 
@@ -25,10 +25,10 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "CLI tool for building changelogs from fragments";
     homepage = "https://github.com/nekitdev/changelogging";
-    changelog = "https://github.com/nekitdev/changelogging/releases/tag/v${version}";
+    changelog = "https://github.com/nekitdev/changelogging/releases/tag/v${finalAttrs.version}";
     platforms = lib.platforms.all;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.nekitdev ];
     mainProgram = "changelogging";
   };
-}
+})
diff --git a/pkgs/by-name/ch/checkpwn/package.nix b/pkgs/by-name/ch/checkpwn/package.nix
index e1d0989d0997..09dc613976e2 100644
--- a/pkgs/by-name/ch/checkpwn/package.nix
+++ b/pkgs/by-name/ch/checkpwn/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "checkpwn";
   version = "0.5.6";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-M0Jb+8rKn4KVuumNSsM6JEbSOoBOFy9mmXiCnUnDgak=";
   };
 
@@ -23,9 +23,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Check Have I Been Pwned and see if it's time for you to change passwords";
     homepage = "https://github.com/brycx/checkpwn";
-    changelog = "https://github.com/brycx/checkpwn/releases/tag/${version}";
+    changelog = "https://github.com/brycx/checkpwn/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "checkpwn";
   };
-}
+})
diff --git a/pkgs/by-name/ch/cherrybomb/package.nix b/pkgs/by-name/ch/cherrybomb/package.nix
index b4d993e7bb48..4ba45531fd30 100644
--- a/pkgs/by-name/ch/cherrybomb/package.nix
+++ b/pkgs/by-name/ch/cherrybomb/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cherrybomb";
   version = "1.0.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-MHKBP102U1Ug9wZm9x4+opZgG8f6Hx03FvoLV4qaDgY=";
   };
 
@@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec {
     description = "CLI tool that helps you avoid undefined user behavior by validating your API specifications";
     mainProgram = "cherrybomb";
     homepage = "https://github.com/blst-security/cherrybomb";
-    changelog = "https://github.com/blst-security/cherrybomb/releases/tag/v${version}";
+    changelog = "https://github.com/blst-security/cherrybomb/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/ci/citron/package.nix b/pkgs/by-name/ci/citron/package.nix
index 3a446d38826f..07f0501a327b 100644
--- a/pkgs/by-name/ci/citron/package.nix
+++ b/pkgs/by-name/ci/citron/package.nix
@@ -7,12 +7,12 @@
   pkg-config,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "citron";
   version = "0.15.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-6wJ4UfiwpV9zFuBR8SYj6eBiRqQitFs7wRe5R51Z3SA=";
   };
 
@@ -37,4 +37,4 @@ rustPlatform.buildRustPackage rec {
     platforms = lib.platforms.linux;
     mainProgram = "citron";
   };
-}
+})
diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix
index 5d72cfb7c4d0..c5de9f3aa0b3 100644
--- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix
+++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix
@@ -5,12 +5,12 @@
   nix-update-script,
   versionCheckHook,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clang-tidy-sarif";
   version = "0.8.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-ALwEsF1n6WYqITfYTn8mIyn3sxTbDux17FxKIorKkFc=";
   };
 
@@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "clang-tidy-sarif";
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/by-name/cl/clini/package.nix b/pkgs/by-name/cl/clini/package.nix
index 9400013eb9c4..a6a8e45f6215 100644
--- a/pkgs/by-name/cl/clini/package.nix
+++ b/pkgs/by-name/cl/clini/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clini";
   version = "0.1.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-+HnoYFRG7GGef5lV4CUsUzqPzFUzXDajprLu25SCMQo=";
   };
 
@@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ Flakebi ];
     mainProgram = "clini";
   };
-}
+})
diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix
index 959014615688..2b221ff106fb 100644
--- a/pkgs/by-name/cl/clippy-sarif/package.nix
+++ b/pkgs/by-name/cl/clippy-sarif/package.nix
@@ -6,12 +6,12 @@
   nix-update-script,
   versionCheckHook,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clippy-sarif";
   version = "0.8.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-pqu7jIKksjn52benebICQEhgCW59MX+RRTcHm2ufjWE=";
   };
 
@@ -32,4 +32,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "clippy-sarif";
     inherit (clippy.meta) platforms;
   };
-}
+})
diff --git a/pkgs/by-name/co/colmena/package.nix b/pkgs/by-name/co/colmena/package.nix
index cc5ccb1fa0dd..f95c311db6e7 100644
--- a/pkgs/by-name/co/colmena/package.nix
+++ b/pkgs/by-name/co/colmena/package.nix
@@ -12,14 +12,14 @@
   testers,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "colmena";
   version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "zhaofengli";
     repo = "colmena";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ=";
   };
 
@@ -57,17 +57,17 @@ rustPlatform.buildRustPackage rec {
 
   passthru = {
     # We guarantee CLI and Nix API stability for the same minor version
-    apiVersion = builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion version));
+    apiVersion = builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion finalAttrs.version));
 
     tests.version = testers.testVersion { package = colmena; };
   };
 
   meta = {
     description = "Simple, stateless NixOS deployment tool";
-    homepage = "https://colmena.cli.rs/${passthru.apiVersion}";
+    homepage = "https://colmena.cli.rs/${finalAttrs.passthru.apiVersion}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ zhaofengli ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "colmena";
   };
-}
+})
diff --git a/pkgs/by-name/co/color-lsp/package.nix b/pkgs/by-name/co/color-lsp/package.nix
index 1aae44dc65ec..81c7e61a824e 100644
--- a/pkgs/by-name/co/color-lsp/package.nix
+++ b/pkgs/by-name/co/color-lsp/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "color-lsp";
   version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "huacnlee";
     repo = "color-lsp";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-p58rAVznBzhBv7gVvaEjMpCrk9kFuEjUvY6U4uMXUE8=";
   };
 
@@ -37,4 +37,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "color-lsp";
   };
-}
+})
diff --git a/pkgs/by-name/cs/csv2svg/package.nix b/pkgs/by-name/cs/csv2svg/package.nix
index 57bc999692ad..3f3d5943d4ef 100644
--- a/pkgs/by-name/cs/csv2svg/package.nix
+++ b/pkgs/by-name/cs/csv2svg/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "csv2svg";
   version = "0.1.9";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-3VebLFkeJLK97jqoPXt4Wt6QTR0Zyu+eQV9oaLBSeHE=";
   };
 
@@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ ];
     mainProgram = "csv2svg";
   };
-}
+})
diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix
index 4230b63a4977..b82cd45dc91a 100644
--- a/pkgs/by-name/di/diffedit3/package.nix
+++ b/pkgs/by-name/di/diffedit3/package.nix
@@ -7,12 +7,12 @@
   diffedit3,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "diffedit3";
   version = "0.6.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-tlrP97XMAAnk5H5wTHPsP1DMSmDqV9wJp1n+22jUtnM=";
   };
 
@@ -32,4 +32,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "diffedit3";
     maintainers = with lib.maintainers; [ thoughtpolice ];
   };
-}
+})
diff --git a/pkgs/by-name/do/dotenvy/package.nix b/pkgs/by-name/do/dotenvy/package.nix
index a3112fea3695..d511802badca 100644
--- a/pkgs/by-name/do/dotenvy/package.nix
+++ b/pkgs/by-name/do/dotenvy/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dotenvy";
   version = "0.15.7";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-virK/TpYBmwTf5UCQCqC/df8iKYAzPBfsQ1nQkFKF2Y=";
   };
 
@@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ phlip9 ];
   };
-}
+})
diff --git a/pkgs/by-name/do/dotslash/package.nix b/pkgs/by-name/do/dotslash/package.nix
index f2f48c3d7168..50886608da9c 100644
--- a/pkgs/by-name/do/dotslash/package.nix
+++ b/pkgs/by-name/do/dotslash/package.nix
@@ -7,12 +7,12 @@
   dotslash,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dotslash";
   version = "0.5.7";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-VFesGum2xjknUuCwIojntdst5dmhvZb78ejJ2OG1FVI=";
   };
 
@@ -45,4 +45,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "dotslash";
     maintainers = with lib.maintainers; [ thoughtpolice ];
   };
-}
+})
diff --git a/pkgs/by-name/du/duckscript/package.nix b/pkgs/by-name/du/duckscript/package.nix
index ddd44b75d796..e769cf55f975 100644
--- a/pkgs/by-name/du/duckscript/package.nix
+++ b/pkgs/by-name/du/duckscript/package.nix
@@ -8,12 +8,12 @@
   libiconv,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "duckscript_cli";
   version = "0.11.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-afxzZkmmYnprUBquH681VHMDs3Co9C71chNoKbu6lEY=";
   };
 
@@ -35,4 +35,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ mkg20001 ];
     mainProgram = "duck";
   };
-}
+})
diff --git a/pkgs/by-name/el/elf2uf2-rs/package.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix
index dbdf6d3c2360..434781557bcb 100644
--- a/pkgs/by-name/el/elf2uf2-rs/package.nix
+++ b/pkgs/by-name/el/elf2uf2-rs/package.nix
@@ -7,12 +7,12 @@
   udev,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "elf2uf2-rs";
   version = "2.2.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-e0i8ecjfNZxQgX5kDU1T8yAGUl4J7mbgG+ueBFsyTNA=";
   };
 
@@ -35,4 +35,4 @@ rustPlatform.buildRustPackage rec {
       moni
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ev/eva/package.nix b/pkgs/by-name/ev/eva/package.nix
index 9581b05f91f9..87d70a0370bf 100644
--- a/pkgs/by-name/ev/eva/package.nix
+++ b/pkgs/by-name/ev/eva/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "eva";
   version = "0.3.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-eX2d9h6zNbheS68j3lyhJW05JZmQN2I2MdcmiZB8Mec=";
   };
 
@@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "eva";
   };
-}
+})
diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix
index 8656401e6a45..16330866a4be 100644
--- a/pkgs/by-name/ew/eww/package.nix
+++ b/pkgs/by-name/ew/eww/package.nix
@@ -13,7 +13,7 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "eww";
   version = "0.6.0-unstable-2025-06-30";
 
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
     "eww"
   ];
 
-  cargoTestFlags = cargoBuildFlags;
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
 
   # requires unstable rust features
   env.RUSTC_BOOTSTRAP = 1;
@@ -76,4 +76,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "eww";
     broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})
diff --git a/pkgs/by-name/fa/faketty/package.nix b/pkgs/by-name/fa/faketty/package.nix
index 994669ea4e03..040dd0981080 100644
--- a/pkgs/by-name/fa/faketty/package.nix
+++ b/pkgs/by-name/fa/faketty/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "faketty";
   version = "1.0.20";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-1AX2DBFOSUcORSQCo/5Vd8puE4hJU9VDfVqxcZDKrrY=";
   };
 
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Wrapper to execute a command in a pty, even if redirecting the output";
     homepage = "https://github.com/dtolnay/faketty";
-    changelog = "https://github.com/dtolnay/faketty/releases/tag/${version}";
+    changelog = "https://github.com/dtolnay/faketty/releases/tag/${finalAttrs.version}";
     license = with lib.licenses; [
       asl20 # or
       mit
@@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "faketty";
   };
-}
+})
diff --git a/pkgs/by-name/fl/flowgger/package.nix b/pkgs/by-name/fl/flowgger/package.nix
index 7b77f21e45e3..c493ef10c54e 100644
--- a/pkgs/by-name/fl/flowgger/package.nix
+++ b/pkgs/by-name/fl/flowgger/package.nix
@@ -7,12 +7,12 @@
   capnproto,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "flowgger";
   version = "0.3.2";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-eybahv1A/AIpAXGj6/md8k+b9fu9gSchU16fnAWZP2s=";
   };
 
@@ -38,4 +38,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ ];
     mainProgram = "flowgger";
   };
-}
+})
diff --git a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
index 1916af6c65ed..1283f597381f 100644
--- a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
+++ b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
@@ -6,7 +6,7 @@
   openssl_3,
   protobuf,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fortanix-sgx-tools";
   version = "0.6.1";
   nativeBuildInputs = [
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   ];
   buildInputs = [ openssl_3 ];
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-IVkmZs3imzj8uN8kqEzN/Oio3H+Nqzu8ORjARNx1TpQ=";
   };
 
@@ -27,4 +27,4 @@ rustPlatform.buildRustPackage rec {
     platforms = [ "x86_64-linux" ];
     license = lib.licenses.mpl20;
   };
-}
+})
diff --git a/pkgs/by-name/fr/frawk/package.nix b/pkgs/by-name/fr/frawk/package.nix
index 3c775a9fb7a0..dda9b3554be1 100644
--- a/pkgs/by-name/fr/frawk/package.nix
+++ b/pkgs/by-name/fr/frawk/package.nix
@@ -15,12 +15,12 @@
 assert lib.assertMsg (
   !(lib.elem "default" features || lib.elem "llvm_backend" features)
 ) "LLVM support has been dropped due to LLVM 12 EOL.";
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "frawk";
   version = "0.4.8";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-wPnMJDx3aF1Slx5pjLfii366pgNU3FJBdznQLuUboYA=";
   };
 
@@ -51,11 +51,11 @@ rustPlatform.buildRustPackage rec {
     description = "Small programming language for writing short programs processing textual data";
     mainProgram = "frawk";
     homepage = "https://github.com/ezrosent/frawk";
-    changelog = "https://github.com/ezrosent/frawk/releases/tag/v${version}";
+    changelog = "https://github.com/ezrosent/frawk/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [
       mit # or
       asl20
     ];
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/fr/french-numbers/package.nix b/pkgs/by-name/fr/french-numbers/package.nix
index 93d8f596a1f3..a5ba539ac20f 100644
--- a/pkgs/by-name/fr/french-numbers/package.nix
+++ b/pkgs/by-name/fr/french-numbers/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "french-numbers";
   version = "1.2.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-6mcqT0RZddHlzjyZzx0JGTfCRcQ2UQ3Qlmk0VVNzsnI=";
   };
 
@@ -27,4 +27,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "french-numbers";
     maintainers = with lib.maintainers; [ samueltardieu ];
   };
-}
+})
diff --git a/pkgs/by-name/ge/gel/package.nix b/pkgs/by-name/ge/gel/package.nix
index 00adee1a1533..69f1120e93f1 100644
--- a/pkgs/by-name/ge/gel/package.nix
+++ b/pkgs/by-name/ge/gel/package.nix
@@ -14,19 +14,19 @@
   gel,
   testers,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gel";
   version = "7.10.2";
 
   src = fetchFromGitHub {
     owner = "geldata";
     repo = "gel-cli";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Fy4J7puunqB5TeUsafnOotoWNvtTGiMJZ06YII14zIM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
+    inherit (finalAttrs) pname version src;
     hash = "sha256-VRZjI8C0u+6MkQgzt0PApeUtrGR5UqvnLZxityMGnDo=";
   };
 
@@ -80,4 +80,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "gel";
   };
-}
+})
diff --git a/pkgs/by-name/ge/genemichaels/package.nix b/pkgs/by-name/ge/genemichaels/package.nix
index eb4dbbe8ca60..532aef28d5a6 100644
--- a/pkgs/by-name/ge/genemichaels/package.nix
+++ b/pkgs/by-name/ge/genemichaels/package.nix
@@ -5,12 +5,12 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "genemichaels";
   version = "0.9.5";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-KaGG2amPk/+fL7xLAfZw4SmCzXc+hS/9IkBG7G6sngI=";
   };
 
@@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ djacu ];
     mainProgram = "genemichaels";
   };
-}
+})
diff --git a/pkgs/by-name/gh/gh-cal/package.nix b/pkgs/by-name/gh/gh-cal/package.nix
index cc536d75408a..f4dc936968d0 100644
--- a/pkgs/by-name/gh/gh-cal/package.nix
+++ b/pkgs/by-name/gh/gh-cal/package.nix
@@ -5,12 +5,12 @@
   pkg-config,
   openssl,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gh-cal";
   version = "0.1.3";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-x9DekflZoXxH964isWCi6YuV3v/iIyYOuRYVgKaUBx0=";
   };
 
@@ -26,4 +26,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ loicreynier ];
     mainProgram = "gh-cal";
   };
-}
+})
diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix
index df72922fd8c6..5df5d02c4620 100644
--- a/pkgs/by-name/gi/gitlab-timelogs/package.nix
+++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix
@@ -8,12 +8,12 @@
   stdenv,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitlab-timelogs";
   version = "0.7.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-DNMJczR4yaglIOcNmb2E1g+UP0VeJaIb5TvdKUcWzc0=";
   };
 
@@ -37,11 +37,11 @@ rustPlatform.buildRustPackage rec {
       gitlab-timelogs is not associated with the official GitLab project!
     '';
     homepage = "https://github.com/phip1611/gitlab-timelogs";
-    changelog = "https://github.com/phip1611/gitlab-timelogs/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/phip1611/gitlab-timelogs/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [
       blitz
       phip1611
     ];
   };
-}
+})
diff --git a/pkgs/by-name/gl/globe-cli/package.nix b/pkgs/by-name/gl/globe-cli/package.nix
index 5851c4917bff..668c093c75cd 100644
--- a/pkgs/by-name/gl/globe-cli/package.nix
+++ b/pkgs/by-name/gl/globe-cli/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "globe-cli";
   version = "0.2.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Np1f/mSMIMZU3hE0Fur8bOHhOH3rZyroGiVAqfiIs7g=";
   };
 
@@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ devhell ];
     mainProgram = "globe";
   };
-}
+})
diff --git a/pkgs/by-name/gp/gpustat/package.nix b/pkgs/by-name/gp/gpustat/package.nix
index c5a31cef73c5..f8c9d136ae46 100644
--- a/pkgs/by-name/gp/gpustat/package.nix
+++ b/pkgs/by-name/gp/gpustat/package.nix
@@ -15,14 +15,14 @@
   makeWrapper,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gpustat";
   version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "arduano";
     repo = "gpustat";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-M9P/qfw/tp9ogkNOE3b2fD2rGFnii1/VwmqJHqXb7Mg=";
   };
 
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec {
   # https://github.com/emilk/egui/issues/2486
   postFixup = ''
     wrapProgram $out/bin/gpustat \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}:/run/opengl-driver/lib"
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}:/run/opengl-driver/lib"
   '';
 
   meta = {
@@ -71,4 +71,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "gpustat";
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/gr/grass-sass/package.nix b/pkgs/by-name/gr/grass-sass/package.nix
index a2f3bb0e9bbc..89d9370552f8 100644
--- a/pkgs/by-name/gr/grass-sass/package.nix
+++ b/pkgs/by-name/gr/grass-sass/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "grass";
   version = "0.13.4";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-uk4XLF0QsH9Nhz73PmdSpwhxPdCh+DlNNqtbJtLWgNI=";
   };
 
@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage rec {
     description = "Sass compiler written purely in Rust";
     homepage = "https://github.com/connorskees/grass";
     changelog = "https://github.com/connorskees/grass/blob/master/CHANGELOG.md#${
-      lib.replaceStrings [ "." ] [ "" ] version
+      lib.replaceStrings [ "." ] [ "" ] finalAttrs.version
     }";
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "grass";
   };
-}
+})
diff --git a/pkgs/by-name/ha/habitat/package.nix b/pkgs/by-name/ha/habitat/package.nix
index fa0cce0a36a5..ce2533f304fa 100644
--- a/pkgs/by-name/ha/habitat/package.nix
+++ b/pkgs/by-name/ha/habitat/package.nix
@@ -11,14 +11,14 @@
   cacert,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "habitat";
   version = "1.6.1245";
 
   src = fetchFromGitHub {
     owner = "habitat-sh";
     repo = "habitat";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-n2ylJSCXPnnPHadfZaRS/3vxtnvkXhiTzCyObK7hmEk=";
   };
 
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
     "-p"
     "hab"
   ];
-  cargoTestFlags = cargoBuildFlags;
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
 
   env = {
     OPENSSL_NO_VENDOR = true;
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Application automation framework";
     homepage = "https://www.habitat.sh";
-    changelog = "https://github.com/habitat-sh/habitat/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/habitat-sh/habitat/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       rushmorem
@@ -60,4 +60,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "hab";
     platforms = [ "x86_64-linux" ];
   };
-}
+})
diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix
index 6cde38b324f3..11d0116195d4 100644
--- a/pkgs/by-name/ha/hadolint-sarif/package.nix
+++ b/pkgs/by-name/ha/hadolint-sarif/package.nix
@@ -5,12 +5,12 @@
   nix-update-script,
   versionCheckHook,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hadolint-sarif";
   version = "0.8.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-7xvo194lCQpDtLgwX6rZEkwG3hYTp5czjw4GrEaivsI=";
   };
 
@@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "hadolint-sarif";
   };
-}
+})
diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index 45b27c7afb96..936a5aedb254 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -19,14 +19,14 @@
   alsa-lib,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "halloy";
   version = "2026.2";
 
   src = fetchFromGitHub {
     owner = "squidowl";
     repo = "halloy";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-xx4r6vdUeh0yr986+Z67xtViQA7mMpsXmTohu3jIwMs=";
   };
 
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec {
       desktopName = "Halloy";
       comment = "IRC client written in Rust";
       icon = "org.squidowl.halloy";
-      exec = pname;
+      exec = finalAttrs.pname;
       terminal = false;
       mimeTypes = [
         "x-scheme-handler/irc"
@@ -99,11 +99,11 @@ rustPlatform.buildRustPackage rec {
     APP_DIR="$out/Applications/Halloy.app/Contents"
 
     mkdir -p "$APP_DIR/MacOS"
-    cp -r ${src}/assets/macos/Halloy.app/Contents/* "$APP_DIR"
+    cp -r ${finalAttrs.src}/assets/macos/Halloy.app/Contents/* "$APP_DIR"
 
     substituteInPlace "$APP_DIR/Info.plist" \
-      --replace-fail "{{ VERSION }}" "${version}" \
-      --replace-fail "{{ BUILD }}" "${version}-nixpkgs"
+      --replace-fail "{{ VERSION }}" "${finalAttrs.version}" \
+      --replace-fail "{{ BUILD }}" "${finalAttrs.version}-nixpkgs"
 
     makeWrapper "$out/bin/halloy" "$APP_DIR/MacOS/halloy"
   '';
@@ -113,7 +113,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "IRC application";
     homepage = "https://github.com/squidowl/halloy";
-    changelog = "https://github.com/squidowl/halloy/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/squidowl/halloy/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       fab
@@ -122,4 +122,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "halloy";
   };
-}
+})
diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix
index 8c80544781ff..54ce9213f6a5 100644
--- a/pkgs/by-name/ha/hayagriva/package.nix
+++ b/pkgs/by-name/ha/hayagriva/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hayagriva";
   version = "0.9.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-9PGo/TPk5QuiVoa5wUGyHufW/VaxqhinxS+u2JMPZBY=";
   };
 
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Work with references: Literature database management, storage, and citation formatting";
     homepage = "https://github.com/typst/hayagriva";
-    changelog = "https://github.com/typst/hayagriva/releases/tag/v${version}";
+    changelog = "https://github.com/typst/hayagriva/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [
       asl20
       mit
@@ -37,4 +37,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ ];
     mainProgram = "hayagriva";
   };
-}
+})
diff --git a/pkgs/by-name/hu/huniq/package.nix b/pkgs/by-name/hu/huniq/package.nix
index 7894b3bc06c4..4e96eddf1921 100644
--- a/pkgs/by-name/hu/huniq/package.nix
+++ b/pkgs/by-name/hu/huniq/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "huniq";
   version = "2.7.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-5GvHM05qY/Jj1mPYwn88Zybn6Nn5nJIaw0XP8iCcrwE=";
   };
 
@@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.bsd3;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/hv/hvm/package.nix b/pkgs/by-name/hv/hvm/package.nix
index 1766f3206b67..0a0554e8e57f 100644
--- a/pkgs/by-name/hv/hvm/package.nix
+++ b/pkgs/by-name/hv/hvm/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hvm";
   version = "2.0.22";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-AD8mv47m4E6H8BVkxTExyhrR7VEnuB/KxnRl2puPnX4=";
   };
 
@@ -28,4 +28,4 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.asl20;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/i3/i3-open-next-ws/package.nix b/pkgs/by-name/i3/i3-open-next-ws/package.nix
index 97e4be1c3ead..704616e09426 100644
--- a/pkgs/by-name/i3/i3-open-next-ws/package.nix
+++ b/pkgs/by-name/i3/i3-open-next-ws/package.nix
@@ -3,12 +3,12 @@
   rustPlatform,
   fetchCrate,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "i3-open-next-ws";
   version = "0.1.5";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-eYHCm8jEv6Ll6/h1kcYHNxWGnVWI41ZB96Jec9oZFsY=";
   };
 
@@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ quantenzitrone ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/in/inputplug/package.nix b/pkgs/by-name/in/inputplug/package.nix
index e73d44672eb7..ba5a4ab47a60 100644
--- a/pkgs/by-name/in/inputplug/package.nix
+++ b/pkgs/by-name/in/inputplug/package.nix
@@ -8,12 +8,12 @@
   stdenv,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "inputplug";
   version = "0.4.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-8Gy0h0QMcittnjuKm+atIJNsY2d6Ua29oab4fkUU+wE=";
   };
 
@@ -40,4 +40,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ jecaro ];
     mainProgram = "inputplug";
   };
-}
+})
diff --git a/pkgs/by-name/jf/jfmt/package.nix b/pkgs/by-name/jf/jfmt/package.nix
index 8dc94b31e770..fdcc8ab9c69b 100644
--- a/pkgs/by-name/jf/jfmt/package.nix
+++ b/pkgs/by-name/jf/jfmt/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jfmt";
   version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "scruffystuffs";
-    repo = "${pname}.rs";
-    rev = "v${version}";
+    repo = "${finalAttrs.pname}.rs";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-X3wk669G07BTPAT5xGbAfIu2Qk90aaJIi1CLmOnSG80=";
   };
 
@@ -21,8 +21,8 @@ rustPlatform.buildRustPackage rec {
     description = "CLI utility to format json files";
     mainProgram = "jfmt";
     homepage = "https://github.com/scruffystuffs/jfmt.rs";
-    changelog = "https://github.com/scruffystuffs/jfmt.rs/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/scruffystuffs/jfmt.rs/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.psibi ];
   };
-}
+})
diff --git a/pkgs/by-name/ju/just-formatter/package.nix b/pkgs/by-name/ju/just-formatter/package.nix
index 1fcbc2062e75..9e9c06d57bf3 100644
--- a/pkgs/by-name/ju/just-formatter/package.nix
+++ b/pkgs/by-name/ju/just-formatter/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "just-formatter";
   version = "1.1.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-HTv55WquFieWmkEKX5sbBOVyYxzjcB/NrMkxbQsff90=";
   };
 
@@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ vuimuich ];
     mainProgram = "just-formatter";
   };
-}
+})
diff --git a/pkgs/by-name/ke/keepass-diff/package.nix b/pkgs/by-name/ke/keepass-diff/package.nix
index 43eb581f74da..8f88ece7ce57 100644
--- a/pkgs/by-name/ke/keepass-diff/package.nix
+++ b/pkgs/by-name/ke/keepass-diff/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "keepass-diff";
   version = "1.2.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-CqLH5Dosp26YfqgOVcZilfo5svAEv+pAbi1zebGMnb4=";
   };
 
@@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ wamserma ];
     mainProgram = "keepass-diff";
   };
-}
+})
diff --git a/pkgs/by-name/ki/kind2/package.nix b/pkgs/by-name/ki/kind2/package.nix
index c571fd6d0058..ae643a3a6ed7 100644
--- a/pkgs/by-name/ki/kind2/package.nix
+++ b/pkgs/by-name/ki/kind2/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kind2";
   version = "0.3.10";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-X2sjfYrSSym289jDJV3hNmcwyQCMnrabmGCUKD5wfdY=";
   };
 
@@ -32,4 +32,4 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/kr/krabby/package.nix b/pkgs/by-name/kr/krabby/package.nix
index fb561c29c2ca..e1bfcdb77b98 100644
--- a/pkgs/by-name/kr/krabby/package.nix
+++ b/pkgs/by-name/kr/krabby/package.nix
@@ -3,12 +3,12 @@
   rustPlatform,
   fetchCrate,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "krabby";
   version = "0.3.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-UcvCIazuVoqYb4iz62MrOVtQli4EqzrEpg3imv3sXHY=";
   };
 
@@ -17,9 +17,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Print pokemon sprites in your terminal";
     homepage = "https://github.com/yannjor/krabby";
-    changelog = "https://github.com/yannjor/krabby/releases/tag/v${version}";
+    changelog = "https://github.com/yannjor/krabby/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ ruby0b ];
     mainProgram = "krabby";
   };
-}
+})
diff --git a/pkgs/by-name/le/lemmeknow/package.nix b/pkgs/by-name/le/lemmeknow/package.nix
index 178ddb6c29cf..b4d9c94b46e0 100644
--- a/pkgs/by-name/le/lemmeknow/package.nix
+++ b/pkgs/by-name/le/lemmeknow/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lemmeknow";
   version = "0.8.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Q82tP4xNWAooFjHeJCFmuULnWlFbgca/9Y2lm8rVXKs=";
   };
 
@@ -18,9 +18,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Tool to identify anything";
     homepage = "https://github.com/swanandx/lemmeknow";
-    changelog = "https://github.com/swanandx/lemmeknow/releases/tag/v${version}";
+    changelog = "https://github.com/swanandx/lemmeknow/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "lemmeknow";
   };
-}
+})
diff --git a/pkgs/by-name/li/license-generator/package.nix b/pkgs/by-name/li/license-generator/package.nix
index cf2cb52e0b02..ada5fe7091f0 100644
--- a/pkgs/by-name/li/license-generator/package.nix
+++ b/pkgs/by-name/li/license-generator/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "license-generator";
   version = "1.3.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-jp7NQfDh512oThZbLj0NbqcH7rxV2R0kDv1wsiTNf/M=";
   };
 
@@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ loicreynier ];
     mainProgram = "license-generator";
   };
-}
+})
diff --git a/pkgs/by-name/lo/loco/package.nix b/pkgs/by-name/lo/loco/package.nix
index 672730e845c0..0c2f26e70c07 100644
--- a/pkgs/by-name/lo/loco/package.nix
+++ b/pkgs/by-name/lo/loco/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
   nix-update-script,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "loco";
   version = "0.16.3";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-DdrLABMiTutIhUHvUw29DYZIT+YHLNJjoTT5kWMeAkU=";
   };
 
@@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ sebrut ];
     mainProgram = "loco";
   };
-}
+})
diff --git a/pkgs/by-name/ls/lscolors/package.nix b/pkgs/by-name/ls/lscolors/package.nix
index f9f5f933f379..652d2a242fc3 100644
--- a/pkgs/by-name/ls/lscolors/package.nix
+++ b/pkgs/by-name/ls/lscolors/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lscolors";
   version = "0.21.0";
 
   src = fetchCrate {
-    inherit version pname;
+    inherit (finalAttrs) version pname;
     hash = "sha256-75RE72Vy4HRRjwa7qOybnUAzxxhBUKSlKfrLrm6Ish8=";
   };
 
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Rust library and tool to colorize paths using LS_COLORS";
     homepage = "https://github.com/sharkdp/lscolors";
-    changelog = "https://github.com/sharkdp/lscolors/releases/tag/v${version}";
+    changelog = "https://github.com/sharkdp/lscolors/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [
       asl20 # or
       mit
@@ -31,4 +31,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ SuperSandro2000 ];
     mainProgram = "lscolors";
   };
-}
+})
diff --git a/pkgs/by-name/md/mdbook-katex/package.nix b/pkgs/by-name/md/mdbook-katex/package.nix
index 974a078ae76d..37d8826f09a5 100644
--- a/pkgs/by-name/md/mdbook-katex/package.nix
+++ b/pkgs/by-name/md/mdbook-katex/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdbook-katex";
   version = "0.9.4";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-xwIW8igfxO9vsck8ktDBc7XFLuYzwqI3I4nLDTYC8JI=";
   };
 
@@ -18,11 +18,11 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time";
     mainProgram = "mdbook-katex";
-    homepage = "https://github.com/lzanini/${pname}";
+    homepage = "https://github.com/lzanini/${finalAttrs.pname}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       lovesegfault
       matthiasbeyer
     ];
   };
-}
+})
diff --git a/pkgs/by-name/md/mdbook-pdf/package.nix b/pkgs/by-name/md/mdbook-pdf/package.nix
index e900fdc318f0..8ab294850278 100644
--- a/pkgs/by-name/md/mdbook-pdf/package.nix
+++ b/pkgs/by-name/md/mdbook-pdf/package.nix
@@ -6,12 +6,12 @@
   openssl,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdbook-pdf";
   version = "0.1.13";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-aADHRlIVWVc43DEfZx8ha/E4FaiAoKtjHccx+LAghtU=";
   };
 
@@ -35,11 +35,11 @@ rustPlatform.buildRustPackage rec {
     description = "Backend for mdBook written in Rust for generating PDF";
     mainProgram = "mdbook-pdf";
     homepage = "https://github.com/HollowMan6/mdbook-pdf";
-    changelog = "https://github.com/HollowMan6/mdbook-pdf/releases/tag/v${version}";
+    changelog = "https://github.com/HollowMan6/mdbook-pdf/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       hollowman6
       matthiasbeyer
     ];
   };
-}
+})
diff --git a/pkgs/by-name/md/mdevctl/package.nix b/pkgs/by-name/md/mdevctl/package.nix
index dd5ca6aac258..2ab57c55cbb0 100644
--- a/pkgs/by-name/md/mdevctl/package.nix
+++ b/pkgs/by-name/md/mdevctl/package.nix
@@ -7,12 +7,12 @@
   udevCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdevctl";
   version = "1.4.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Zh+Dj3X87tTpqT/weZMpf7f3obqikjPy9pi50ifp6wQ=";
   };
 
@@ -49,4 +49,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ edwtjo ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/me/meow/package.nix b/pkgs/by-name/me/meow/package.nix
index 43f3b158b6d9..479de620613f 100644
--- a/pkgs/by-name/me/meow/package.nix
+++ b/pkgs/by-name/me/meow/package.nix
@@ -5,13 +5,13 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "meow";
   version = "2.1.5";
 
   src = fetchCrate {
-    inherit version;
-    crateName = "${pname}-cli";
+    inherit (finalAttrs) version;
+    crateName = "${finalAttrs.pname}-cli";
     sha256 = "sha256-6tf4/KRZj+1zlxnNgz3kw/HYR2QKg0kEwu+TbKah3e8=";
   };
 
@@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "meow";
     maintainers = with lib.maintainers; [ pixelsergey ];
   };
-}
+})
diff --git a/pkgs/by-name/mo/movine/package.nix b/pkgs/by-name/mo/movine/package.nix
index 7040bbad4a76..41a1f0238ba1 100644
--- a/pkgs/by-name/mo/movine/package.nix
+++ b/pkgs/by-name/mo/movine/package.nix
@@ -6,12 +6,12 @@
   openssl,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "movine";
   version = "0.11.4";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-wa2GfV2Y8oX8G+1LbWnb2KH/+QbUYL9GXgOOVHpzbN8=";
   };
 
@@ -49,4 +49,4 @@ rustPlatform.buildRustPackage rec {
     '';
     maintainers = with lib.maintainers; [ netcrns ];
   };
-}
+})
diff --git a/pkgs/by-name/ne/nethoscope/package.nix b/pkgs/by-name/ne/nethoscope/package.nix
index 279b0681d6b6..8bc21edc41bd 100644
--- a/pkgs/by-name/ne/nethoscope/package.nix
+++ b/pkgs/by-name/ne/nethoscope/package.nix
@@ -8,14 +8,14 @@
   expect,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nethoscope";
   version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "vvilhonen";
     repo = "nethoscope";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-v7GO+d4b0N3heN10+WSUJEpcShKmx4BPR1FyZoELWzc=";
   };
 
@@ -36,10 +36,10 @@ rustPlatform.buildRustPackage rec {
 
   doInstallCheck = true;
   installCheckPhase = ''
-    if [[ "$(${expect}/bin/unbuffer "$out/bin/${pname}" --help 2> /dev/null | strings | grep ${version} | tr -d '\n')" == " ${version}" ]]; then
-      echo '${pname} smoke check passed'
+    if [[ "$(${expect}/bin/unbuffer "$out/bin/${finalAttrs.pname}" --help 2> /dev/null | strings | grep ${finalAttrs.version} | tr -d '\n')" == " ${finalAttrs.version}" ]]; then
+      echo '${finalAttrs.pname} smoke check passed'
     else
-      echo '${pname} smoke check failed'
+      echo '${finalAttrs.pname} smoke check failed'
       return 1
     fi
   '';
@@ -57,4 +57,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "nethoscope";
   };
 
-}
+})
diff --git a/pkgs/by-name/nf/nflz/package.nix b/pkgs/by-name/nf/nflz/package.nix
index fcc7ce4a48c6..43196b9c0ff2 100644
--- a/pkgs/by-name/nf/nflz/package.nix
+++ b/pkgs/by-name/nf/nflz/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nflz";
   version = "1.0.2";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-c9+79zrIU/M1Rh+DiaLJzbrNSa4IKrYk1gP0dsabUiw=";
   };
 
@@ -33,4 +33,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ phip1611 ];
     mainProgram = "nflz";
   };
-}
+})
diff --git a/pkgs/by-name/ni/nix-template/package.nix b/pkgs/by-name/ni/nix-template/package.nix
index e454b017109f..96e12a744fc7 100644
--- a/pkgs/by-name/ni/nix-template/package.nix
+++ b/pkgs/by-name/ni/nix-template/package.nix
@@ -10,15 +10,15 @@
   pkg-config,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nix-template";
   version = "0.4.1";
 
   src = fetchFromGitHub {
-    name = "${pname}-${version}-src";
+    name = "${finalAttrs.pname}-${finalAttrs.version}-src";
     owner = "jonringer";
     repo = "nix-template";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-42u5FmTIKHpfQ2zZQXIrFkAN2/XvU0wWnCRrQkQzcNI=";
   };
 
@@ -48,9 +48,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Make creating nix expressions easy";
     homepage = "https://github.com/jonringer/nix-template/";
-    changelog = "https://github.com/jonringer/nix-template/releases/tag/v${version}";
+    changelog = "https://github.com/jonringer/nix-template/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.cc0;
     maintainers = [ ];
     mainProgram = "nix-template";
   };
-}
+})
diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix
index 948288be260a..fd5eb689ce2b 100644
--- a/pkgs/by-name/oc/oculante/package.nix
+++ b/pkgs/by-name/oc/oculante/package.nix
@@ -21,7 +21,7 @@
   wrapGAppsHook3,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oculante";
   version = "0.9.2.1-unstable-2025-10-08";
 
@@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec {
 
   patchFlags = [
     "-p1"
-    "--directory=../${pname}-${version}-vendor"
+    "--directory=../${finalAttrs.pname}-${finalAttrs.version}-vendor"
   ];
 
   postInstall = ''
@@ -98,11 +98,11 @@ rustPlatform.buildRustPackage rec {
     broken = stdenv.hostPlatform.isDarwin;
     description = "Minimalistic crossplatform image viewer written in Rust";
     homepage = "https://github.com/woelper/oculante";
-    changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/woelper/oculante/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     mainProgram = "oculante";
     maintainers = with lib.maintainers; [
       dit7ya
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix
index 87891f774e09..9da60c7f8b75 100644
--- a/pkgs/by-name/ov/overlayed/package.nix
+++ b/pkgs/by-name/ov/overlayed/package.nix
@@ -17,14 +17,14 @@
   openssl,
   webkitgtk_4_1,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "overlayed";
   version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "overlayeddev";
     repo = "overlayed";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-3GFg8czBf1csojXUNC51xFXJnGuXltP6D46fCt6q24I=";
   };
 
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-6wN4nZQWrY0J5E+auj17B3iJ/84hzBXYA/bJsX/N5pk=";
 
   pnpmDeps = fetchPnpmDeps {
-    inherit pname version src;
+    inherit (finalAttrs) pname version src;
     pnpm = pnpm_9;
     fetcherVersion = 3;
     hash = "sha256-KJZuucXB7BEMnqPmgytveG/IBEzq4mgMo9ZJHPe/gVs=";
@@ -73,10 +73,10 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Modern discord voice chat overlay";
     homepage = "https://github.com/overlayeddev/overlayed";
-    changelog = "https://github.com/overlayeddev/overlayed/releases/tag/v${version}";
+    changelog = "https://github.com/overlayeddev/overlayed/releases/tag/v${finalAttrs.version}";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ bot-wxt1221 ];
     license = lib.licenses.agpl3Plus;
     mainProgram = "overlayed";
   };
-}
+})
diff --git a/pkgs/by-name/pa/paging-calculator/package.nix b/pkgs/by-name/pa/paging-calculator/package.nix
index daeccc261ed7..6fd238e3b66d 100644
--- a/pkgs/by-name/pa/paging-calculator/package.nix
+++ b/pkgs/by-name/pa/paging-calculator/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "paging-calculator";
   version = "0.4.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-mTHBARrcq8cJxzh80v/fGr5vACAMyy/DhN8zpQTV0jM=";
   };
 
@@ -26,8 +26,8 @@ rustPlatform.buildRustPackage rec {
       which level of the page table.
     '';
     homepage = "https://github.com/phip1611/paging-calculator";
-    changelog = "https://github.com/phip1611/paging-calculator/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/phip1611/paging-calculator/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ phip1611 ];
   };
-}
+})
diff --git a/pkgs/by-name/pa/panamax/package.nix b/pkgs/by-name/pa/panamax/package.nix
index ce6b79f82927..eb2d4b6d1f89 100644
--- a/pkgs/by-name/pa/panamax/package.nix
+++ b/pkgs/by-name/pa/panamax/package.nix
@@ -8,12 +8,12 @@
   zlib,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "panamax";
   version = "1.0.14";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-gIgw6JMGpHNXE/PZoz3jRdmjIWy4hETYf24Nd7/Jr/g=";
   };
 
@@ -37,4 +37,4 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/pe/perseus-cli/package.nix b/pkgs/by-name/pe/perseus-cli/package.nix
index f0644e26c303..0de27545fe47 100644
--- a/pkgs/by-name/pe/perseus-cli/package.nix
+++ b/pkgs/by-name/pe/perseus-cli/package.nix
@@ -6,12 +6,12 @@
   wasm-pack,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "perseus-cli";
   version = "0.3.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-IYjLx9/4oWSXa4jhOtGw1GOHmrR7LQ6bWyN5zbOuEFs=";
   };
 
@@ -31,4 +31,4 @@ rustPlatform.buildRustPackage rec {
     license = with lib.licenses; [ mit ];
     mainProgram = "perseus";
   };
-}
+})
diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix
index 66c34335693d..9642d452aa42 100644
--- a/pkgs/by-name/pi/pijul/package.nix
+++ b/pkgs/by-name/pi/pijul/package.nix
@@ -12,12 +12,12 @@
   libgit2 ? null,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pijul";
   version = "1.0.0-beta.9";
 
   src = fetchCrate {
-    inherit version pname;
+    inherit (finalAttrs) version pname;
     hash = "sha256-jy0mzgLw9iWuoWe2ictMTL3cHnjJ5kzs6TAK+pdm28g=";
   };
 
@@ -55,4 +55,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "pijul";
   };
-}
+})
diff --git a/pkgs/by-name/pi/pipe-rename/package.nix b/pkgs/by-name/pi/pipe-rename/package.nix
index 0cb2fc75d38c..11e5008e6600 100644
--- a/pkgs/by-name/pi/pipe-rename/package.nix
+++ b/pkgs/by-name/pi/pipe-rename/package.nix
@@ -5,12 +5,12 @@
   python3,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pipe-rename";
   version = "1.6.6";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-eZldAhqmoIkNZaI6r31hI43KCPDDeWk3fKpY3/BaUQE=";
   };
 
@@ -35,4 +35,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ ];
     mainProgram = "renamer";
   };
-}
+})
diff --git a/pkgs/by-name/pr/preserves-tools/package.nix b/pkgs/by-name/pr/preserves-tools/package.nix
index 9d0cab01237e..13995bc1e512 100644
--- a/pkgs/by-name/pr/preserves-tools/package.nix
+++ b/pkgs/by-name/pr/preserves-tools/package.nix
@@ -6,12 +6,12 @@
   installShellFiles,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "preserves-tools";
   version = "4.996.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Uyh5mXCypX3TDxxJtnTe6lBoVI8aqdG56ywn7htDGUY=";
   };
 
@@ -31,4 +31,4 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.asl20;
     mainProgram = "preserves-tool";
   };
-}
+})
diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix
index 55de3239cb2a..7529bfad0593 100644
--- a/pkgs/by-name/pr/probe-rs-tools/package.nix
+++ b/pkgs/by-name/pr/probe-rs-tools/package.nix
@@ -16,20 +16,20 @@ let
     hash = "sha256-yjxld5ebm2jpfyzkw+vngBfHu5Nfh2ioLUKQQDY4KYo=";
   };
 in
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "probe-rs-tools";
   version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "probe-rs";
     repo = "probe-rs";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ZcH2FBKsbBtTYfRQgPfOOODDpyB7VydcO7F7pq8xzD0=";
   };
 
   cargoHash = "sha256-fVmwZw34lK6eKkqNT/SW5wzeeyWg6Qp48eso6yibICE=";
 
-  buildAndTestSubdir = pname;
+  buildAndTestSubdir = finalAttrs.pname;
 
   nativeBuildInputs = [
     # required by libz-sys, no option for dynamic linking
@@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "CLI tool for on-chip debugging and flashing of ARM chips";
     homepage = "https://probe.rs/";
-    changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/probe-rs/probe-rs/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       asl20 # or
       mit
@@ -86,4 +86,4 @@ rustPlatform.buildRustPackage rec {
       newam
     ];
   };
-}
+})
diff --git a/pkgs/by-name/pr/process-viewer/package.nix b/pkgs/by-name/pr/process-viewer/package.nix
index d6a41c3821ac..570128c7752e 100644
--- a/pkgs/by-name/pr/process-viewer/package.nix
+++ b/pkgs/by-name/pr/process-viewer/package.nix
@@ -6,12 +6,12 @@
   gtk4,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "process-viewer";
   version = "0.5.8";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-mEmtLCtHlrCurjKKJ3vEtEkLBik4LwuUED5UeQ1QLws=";
   };
 
@@ -34,4 +34,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ lib.maintainers.matthiasbeyer ];
     mainProgram = "process_viewer";
   };
-}
+})
diff --git a/pkgs/by-name/pr/prometheus-wireguard-exporter/package.nix b/pkgs/by-name/pr/prometheus-wireguard-exporter/package.nix
index 0a433fb020a7..72a475518566 100644
--- a/pkgs/by-name/pr/prometheus-wireguard-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-wireguard-exporter/package.nix
@@ -7,14 +7,14 @@
   nixosTests,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wireguard-exporter";
   version = "3.6.6";
 
   src = fetchFromGitHub {
     owner = "MindFlavor";
     repo = "prometheus_wireguard_exporter";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-2e31ZuGJvpvu7L2Lb+n6bZWpC1JhETzEzSiNaxxsAtA=";
   };
 
@@ -41,4 +41,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "prometheus_wireguard_exporter";
   };
-}
+})
diff --git a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix
index 5594ab1e206b..269b1129b2a5 100644
--- a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix
@@ -5,12 +5,12 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "protoc-gen-prost-crate";
   version = "0.5.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-FBgvDhlyVAegF5n9U6Tunn+MpXdek4f1xWIS3sJ4soI=";
   };
 
@@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec {
       sitaaax
     ];
   };
-}
+})
diff --git a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix
index 86a12a1754e8..8de7cd5140e3 100644
--- a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix
@@ -5,12 +5,12 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "protoc-gen-prost-serde";
   version = "0.4.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-tgsGyUVoQZQcOqh56KGVwS3VcxwbKzBL3P2VpYs72Ok=";
   };
 
@@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec {
       sitaaax
     ];
   };
-}
+})
diff --git a/pkgs/by-name/pr/protoc-gen-prost/package.nix b/pkgs/by-name/pr/protoc-gen-prost/package.nix
index f617dd125123..0a335695ac34 100644
--- a/pkgs/by-name/pr/protoc-gen-prost/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-prost/package.nix
@@ -5,12 +5,12 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "protoc-gen-prost";
   version = "0.5.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-oeoPQ3hYMQl6sXszpnw6er2HBkxpo4s17XjR0VRKrSA=";
   };
 
@@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec {
       sitaaax
     ];
   };
-}
+})
diff --git a/pkgs/by-name/pr/protoc-gen-tonic/package.nix b/pkgs/by-name/pr/protoc-gen-tonic/package.nix
index cf7450a19af5..693c430e014c 100644
--- a/pkgs/by-name/pr/protoc-gen-tonic/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-tonic/package.nix
@@ -5,12 +5,12 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "protoc-gen-tonic";
   version = "0.5.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-F3AVlkyIbSaA6u7/Pm6qM9AuONddSwqcCU6OAHoVwxk=";
   };
 
@@ -29,4 +29,4 @@ rustPlatform.buildRustPackage rec {
       sitaaax
     ];
   };
-}
+})
diff --git a/pkgs/by-name/pr/protox/package.nix b/pkgs/by-name/pr/protox/package.nix
index 33c738a4cb44..2621e20aa2ab 100644
--- a/pkgs/by-name/pr/protox/package.nix
+++ b/pkgs/by-name/pr/protox/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "protox";
   version = "0.9.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-3Bh+VDSsol2Pz3UVDSxx8KNJbzKParU/OoNcSNgVTJM=";
   };
 
@@ -24,11 +24,11 @@ rustPlatform.buildRustPackage rec {
     description = "Rust implementation of the protobuf compiler";
     mainProgram = "protox";
     homepage = "https://github.com/andrewhickman/protox";
-    changelog = "https://github.com/andrewhickman/protox/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/andrewhickman/protox/blob/${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       asl20
       mit
     ];
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/pu/pulldown-cmark/package.nix b/pkgs/by-name/pu/pulldown-cmark/package.nix
index f40f92099c3d..9309be6f8de8 100644
--- a/pkgs/by-name/pu/pulldown-cmark/package.nix
+++ b/pkgs/by-name/pu/pulldown-cmark/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pulldown-cmark";
   version = "0.13.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-iQjA2mt1l0mP8yevWwjrfN/u9FXBnIv+ObjMSOsqlhw=";
   };
 
@@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ CobaltCause ];
     mainProgram = "pulldown-cmark";
   };
-}
+})
diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix
index 60a5608aa6b2..bfe1e64d7cf4 100644
--- a/pkgs/by-name/ra/rav1e/package.nix
+++ b/pkgs/by-name/ra/rav1e/package.nix
@@ -11,12 +11,12 @@
   rav1e,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rav1e";
   version = "0.8.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-GCfh2v3w5C8h4GuPKkTMUAhPspT1W0drrRpELCJWeTI=";
   };
 
@@ -64,9 +64,9 @@ rustPlatform.buildRustPackage rec {
       Features: https://github.com/xiph/rav1e#features
     '';
     homepage = "https://github.com/xiph/rav1e";
-    changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}";
+    changelog = "https://github.com/xiph/rav1e/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "rav1e";
   };
-}
+})
diff --git a/pkgs/by-name/ra/ravedude/package.nix b/pkgs/by-name/ra/ravedude/package.nix
index 218fe53555d3..202de58d4938 100644
--- a/pkgs/by-name/ra/ravedude/package.nix
+++ b/pkgs/by-name/ra/ravedude/package.nix
@@ -12,12 +12,12 @@
   stdenv,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ravedude";
   version = "0.2.2";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Ar2oQx7dKKfzkM3FMcJXiPHxNa0KcMRht38q+NgowfU=";
   };
 
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     updateScript = nix-update-script { };
     tests.version = testers.testVersion {
       package = ravedude;
-      version = "v${version}";
+      version = "v${finalAttrs.version}";
     };
   };
 
@@ -56,4 +56,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "ravedude";
   };
-}
+})
diff --git a/pkgs/by-name/re/regex-cli/package.nix b/pkgs/by-name/re/regex-cli/package.nix
index 52cd85274791..4e2cc1c34167 100644
--- a/pkgs/by-name/re/regex-cli/package.nix
+++ b/pkgs/by-name/re/regex-cli/package.nix
@@ -5,12 +5,12 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "regex-cli";
   version = "0.2.3";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-ytI1C2QRUfInIChwtSaHze7VJnP9UIcO93e2wjz2/I0=";
   };
 
@@ -28,4 +28,4 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [ mdaniels5757 ];
   };
-}
+})
diff --git a/pkgs/by-name/re/reshape/package.nix b/pkgs/by-name/re/reshape/package.nix
index 08ea40d2bf3b..6d8a4ca269e6 100644
--- a/pkgs/by-name/re/reshape/package.nix
+++ b/pkgs/by-name/re/reshape/package.nix
@@ -6,12 +6,12 @@
   postgresql,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "reshape";
   version = "0.8.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-viS//3ZFqogI0BbZ0rypo5zpQUgqKiLgK585iw3BMgM=";
   };
 
@@ -34,8 +34,8 @@ rustPlatform.buildRustPackage rec {
     description = "Easy-to-use, zero-downtime schema migration tool for Postgres";
     mainProgram = "reshape";
     homepage = "https://github.com/fabianlindfors/reshape";
-    changelog = "https://github.com/fabianlindfors/reshape/releases/tag/v${version}";
+    changelog = "https://github.com/fabianlindfors/reshape/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ilyakooo0 ];
   };
-}
+})
diff --git a/pkgs/by-name/re/restic-browser/package.nix b/pkgs/by-name/re/restic-browser/package.nix
index 3a4d48430c47..bc6118b8cbbc 100644
--- a/pkgs/by-name/re/restic-browser/package.nix
+++ b/pkgs/by-name/re/restic-browser/package.nix
@@ -14,22 +14,22 @@
   nix-update-script,
   restic,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "restic-browser";
   version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "emuell";
     repo = "restic-browser";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-K8JEt1kOvu/G3S1O6W/ee2JM968bgPR/FeGaBKP6elU=";
   };
 
   cargoHash = "sha256-/EgSr46mJV84s/MG/3nUnU6XQ8RtEWiWo0gFtegblEQ=";
 
   npmDeps = fetchNpmDeps {
-    name = "${pname}-npm-deps-${version}";
-    inherit src;
+    name = "${finalAttrs.pname}-npm-deps-${finalAttrs.version}";
+    inherit (finalAttrs) src;
     hash = "sha256-uyn5cXMKm7+LLuF+n94pBTypLiPvfAs5INDEtd9cHs0=";
   };
 
@@ -51,11 +51,11 @@ rustPlatform.buildRustPackage rec {
   ];
 
   cargoRoot = "src-tauri";
-  buildAndTestSubdir = cargoRoot;
+  buildAndTestSubdir = finalAttrs.cargoRoot;
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/bin
-    ln -s $out/Applications/Restic-Browser.app/Contents/MacOS/Restic-Browser $out/bin/${meta.mainProgram}
+    ln -s $out/Applications/Restic-Browser.app/Contents/MacOS/Restic-Browser $out/bin/${finalAttrs.meta.mainProgram}
   '';
 
   passthru.updateScript = nix-update-script { };
@@ -63,10 +63,10 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "GUI to browse and restore restic backup repositories";
     homepage = "https://github.com/emuell/restic-browser";
-    changelog = "https://github.com/emuell/restic-browser/releases/tag/v${version}";
+    changelog = "https://github.com/emuell/restic-browser/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ js6pak ];
     mainProgram = "restic-browser";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
-}
+})
diff --git a/pkgs/by-name/rs/rsign2/package.nix b/pkgs/by-name/rs/rsign2/package.nix
index 97e3d174c71a..ce148c92f940 100644
--- a/pkgs/by-name/rs/rsign2/package.nix
+++ b/pkgs/by-name/rs/rsign2/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rsign2";
   version = "0.6.5";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-cjucecEg5ERPsiaDuGESf2u9RTYHpQmHwWPnx1ask0I=";
   };
 
@@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ ];
     mainProgram = "rsign";
   };
-}
+})
diff --git a/pkgs/by-name/rs/rsonpath/package.nix b/pkgs/by-name/rs/rsonpath/package.nix
index 134b3c8715c0..cdcf2f612a33 100644
--- a/pkgs/by-name/rs/rsonpath/package.nix
+++ b/pkgs/by-name/rs/rsonpath/package.nix
@@ -5,7 +5,7 @@
   unstableGitUpdater,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rsonpath";
   version = "0.9.1-unstable-2024-11-15";
 
@@ -23,14 +23,14 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-9pSn0f0VWsBg1z1UYGRtMb1z23htRm7qLmO80zvSjN8=";
 
   cargoBuildFlags = [ "-p=rsonpath" ];
-  cargoTestFlags = cargoBuildFlags;
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
 
   meta = {
     description = "Experimental JSONPath engine for querying massive streamed datasets";
     homepage = "https://github.com/v0ldek/rsonpath";
-    changelog = "https://github.com/v0ldek/rsonpath/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/v0ldek/rsonpath/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "rq";
   };
-}
+})
diff --git a/pkgs/by-name/ru/rust-audit-info/package.nix b/pkgs/by-name/ru/rust-audit-info/package.nix
index 79000840d662..e9fd0c24fb99 100644
--- a/pkgs/by-name/ru/rust-audit-info/package.nix
+++ b/pkgs/by-name/ru/rust-audit-info/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rust-audit-info";
   version = "0.5.4";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-zxdF65/9cgdDLM7HA30NCEZj1S5SogH+oM3aq55K0os=";
   };
 
@@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/ru/rustfinity/package.nix b/pkgs/by-name/ru/rustfinity/package.nix
index 948f1d279589..a73d835f43aa 100644
--- a/pkgs/by-name/ru/rustfinity/package.nix
+++ b/pkgs/by-name/ru/rustfinity/package.nix
@@ -6,12 +6,12 @@
   pkg-config,
   openssl,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustfinity";
   version = "0.3.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-5UhKL6lXli1mGorThv3SFclVKDATmxklZQ+S5hwqQgc=";
   };
 
@@ -38,4 +38,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ nartsiss ];
     mainProgram = "rustfinity";
   };
-}
+})
diff --git a/pkgs/by-name/ru/rustycli/package.nix b/pkgs/by-name/ru/rustycli/package.nix
index 9303dcd74ce4..f6385251cb37 100644
--- a/pkgs/by-name/ru/rustycli/package.nix
+++ b/pkgs/by-name/ru/rustycli/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustycli";
   version = "0.1.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-4Txw6Cmwwgu7K8VIVoX9GR76VUqAEw6uYptmczbjqg0=";
   };
 
@@ -22,8 +22,8 @@ rustPlatform.buildRustPackage rec {
     description = "Access the rust playground right in terminal";
     mainProgram = "rustycli";
     homepage = "https://github.com/pwnwriter/rustycli";
-    changelog = "https://github.com/pwnwriter/rustycli/releases/tag/v${version}";
+    changelog = "https://github.com/pwnwriter/rustycli/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.matthiasbeyer ];
   };
-}
+})
diff --git a/pkgs/by-name/sa/safe-rm/package.nix b/pkgs/by-name/sa/safe-rm/package.nix
index 40e7b4c900a2..aac13f960d2f 100644
--- a/pkgs/by-name/sa/safe-rm/package.nix
+++ b/pkgs/by-name/sa/safe-rm/package.nix
@@ -6,13 +6,13 @@
   installShellFiles,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "safe-rm";
   version = "1.1.0";
 
   src = fetchgit {
     url = "https://git.launchpad.net/safe-rm";
-    tag = "${pname}-${version}";
+    tag = "${finalAttrs.pname}-${finalAttrs.version}";
     sha256 = "sha256-7+4XwsjzLBCQmHDYNwhlN4Yg3eL43GUEbq8ROtuP2Kw=";
   };
 
@@ -40,4 +40,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ SuperSandro2000 ];
     mainProgram = "safe-rm";
   };
-}
+})
diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix
index 9ff815ea6c3d..cd6e8cf43277 100644
--- a/pkgs/by-name/sa/samply/package.nix
+++ b/pkgs/by-name/sa/samply/package.nix
@@ -6,12 +6,12 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "samply";
   version = "0.13.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-zTwAsE6zXY3esO7x6UTCO2DbzdUSKZ6qc5Rr9qcI+Z8=";
   };
 
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Command line profiler for macOS and Linux";
     homepage = "https://github.com/mstange/samply";
-    changelog = "https://github.com/mstange/samply/releases/tag/samply-v${version}";
+    changelog = "https://github.com/mstange/samply/releases/tag/samply-v${finalAttrs.version}";
     license = with lib.licenses; [
       asl20
       mit
@@ -33,4 +33,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ ];
     mainProgram = "samply";
   };
-}
+})
diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix
index b001378b1895..1443d093ec1f 100644
--- a/pkgs/by-name/sa/sarif-fmt/package.nix
+++ b/pkgs/by-name/sa/sarif-fmt/package.nix
@@ -6,12 +6,12 @@
   nix-update-script,
   versionCheckHook,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sarif-fmt";
   version = "0.8.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Xc9uc//5wTBWJ89mcaC/4c8/xtTvnu8g2Aa1viUhluo=";
   };
 
@@ -46,4 +46,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "sarif-fmt";
   };
-}
+})
diff --git a/pkgs/by-name/se/sea-orm-cli/package.nix b/pkgs/by-name/se/sea-orm-cli/package.nix
index aee39070a119..7e393463c090 100644
--- a/pkgs/by-name/se/sea-orm-cli/package.nix
+++ b/pkgs/by-name/se/sea-orm-cli/package.nix
@@ -7,12 +7,12 @@
   nix-update-script,
   versionCheckHook,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sea-orm-cli";
   version = "1.1.19";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-dsise5MDhR4pcD3ZWDUzTG0Q4Fg/VdKw2Q59/g6BabA=";
   };
 
@@ -40,4 +40,4 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [ traxys ];
   };
-}
+})
diff --git a/pkgs/by-name/sg/sgxs-tools/package.nix b/pkgs/by-name/sg/sgxs-tools/package.nix
index 2f6025a3cb09..e80dbf630a52 100644
--- a/pkgs/by-name/sg/sgxs-tools/package.nix
+++ b/pkgs/by-name/sg/sgxs-tools/package.nix
@@ -6,7 +6,7 @@
   openssl_3,
   protobuf,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sgxs-tools";
   version = "0.9.2";
   nativeBuildInputs = [
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   ];
   buildInputs = [ openssl_3 ];
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-vLbSjDULrYL8emQTha4fhEbr00OlhXNa00QhCKCnWDc=";
   };
 
@@ -27,4 +27,4 @@ rustPlatform.buildRustPackage rec {
     platforms = [ "x86_64-linux" ];
     license = lib.licenses.mpl20;
   };
-}
+})
diff --git a/pkgs/by-name/sh/shellcheck-sarif/package.nix b/pkgs/by-name/sh/shellcheck-sarif/package.nix
index 2d94ecebb8ab..fa24a97c5586 100644
--- a/pkgs/by-name/sh/shellcheck-sarif/package.nix
+++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix
@@ -5,12 +5,12 @@
   nix-update-script,
   versionCheckHook,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "shellcheck-sarif";
   version = "0.8.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-G69DiDl78vkPuLodsRTL7dbbIFtNNF/XWuLZpCHKJws=";
   };
 
@@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "shellcheck-sarif";
   };
-}
+})
diff --git a/pkgs/by-name/si/sigi/package.nix b/pkgs/by-name/si/sigi/package.nix
index c1fa1fdf8d68..7e16c9f82c67 100644
--- a/pkgs/by-name/si/sigi/package.nix
+++ b/pkgs/by-name/si/sigi/package.nix
@@ -7,12 +7,12 @@
   sigi,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sigi";
   version = "3.7.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Tsrfan7aejP2oy9x9VoTIq0ba0s0tnx1RTlAB0v6eis=";
   };
 
@@ -35,4 +35,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ booniepepper ];
     mainProgram = "sigi";
   };
-}
+})
diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix
index a1e7f9a1af53..fa3a8c37f6da 100644
--- a/pkgs/by-name/sl/slimevr/package.nix
+++ b/pkgs/by-name/sl/slimevr/package.nix
@@ -20,14 +20,14 @@
   libayatana-appindicator,
   udevCheckHook,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "slimevr";
   version = "18.1.0";
 
   src = fetchFromGitHub {
     owner = "SlimeVR";
     repo = "SlimeVR-Server";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-vU/dcKRlNsixr3TaCrqNkCd2ewAb38fLymb+ZslAum4=";
     # solarxr
     fetchSubmodules = true;
@@ -38,8 +38,8 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-X5IgWZlkvsstMN3YS4r+NJl6RVfREfZqKUrfsrUPQuU=";
 
   pnpmDeps = fetchPnpmDeps {
-    pname = "${pname}-pnpm-deps";
-    inherit version src;
+    pname = "${finalAttrs.pname}-pnpm-deps";
+    inherit (finalAttrs) version src;
     pnpm = pnpm_9;
     fetcherVersion = 3;
     hash = "sha256-deVfRZcMFkOVWXmNUiixmd5WBfIFKxG2Gw3CfshspYo=";
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec {
   patches = [
     # Upstream code uses Git to find the program version.
     (replaceVars ./gui-no-git.patch {
-      version = src.tag;
+      version = finalAttrs.src.tag;
     })
     # By default, SlimeVR will give a big warning about our `JAVA_TOOL_OPTIONS` changes.
     ./no-java-tool-options-warning.patch
@@ -121,7 +121,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = {
     homepage = "https://slimevr.dev";
-    changelog = "https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v${version}";
+    changelog = "https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v${finalAttrs.version}";
     description = "App for facilitating full-body tracking in virtual reality";
     longDescription = ''
       App for SlimeVR ecosystem. It orchestrates communication between multiple sensors and integrations, like SteamVR.
@@ -153,4 +153,4 @@ rustPlatform.buildRustPackage rec {
     broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "slimevr";
   };
-}
+})
diff --git a/pkgs/by-name/sp/specr-transpile/package.nix b/pkgs/by-name/sp/specr-transpile/package.nix
index 85b9dcb5a4b3..05b0080f53f6 100644
--- a/pkgs/by-name/sp/specr-transpile/package.nix
+++ b/pkgs/by-name/sp/specr-transpile/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "specr-transpile";
   version = "0.1.25";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-yB4b7VaZ22zk8jhQijBOWRks22TV19q9IQNlVXyBlss=";
   };
 
@@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/sp/spr/package.nix b/pkgs/by-name/sp/spr/package.nix
index 0bee8f388093..fa5cb12f9d70 100644
--- a/pkgs/by-name/sp/spr/package.nix
+++ b/pkgs/by-name/sp/spr/package.nix
@@ -6,12 +6,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "spr";
   version = "1.3.7";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-YmmPxsDoV1sYmqY0Jfqm3xTPmu7WWuIUQyOaICu3stM=";
   };
 
@@ -28,4 +28,4 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ spacedentist ];
   };
-}
+})
diff --git a/pkgs/by-name/ss/ssh-agent-switcher/package.nix b/pkgs/by-name/ss/ssh-agent-switcher/package.nix
index cb4892fee7de..24507ef5306b 100644
--- a/pkgs/by-name/ss/ssh-agent-switcher/package.nix
+++ b/pkgs/by-name/ss/ssh-agent-switcher/package.nix
@@ -8,14 +8,14 @@
   shtk,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ssh-agent-switcher";
   version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "jmmv";
     repo = "ssh-agent-switcher";
-    tag = "ssh-agent-switcher-${version}";
+    tag = "ssh-agent-switcher-${finalAttrs.version}";
     hash = "sha256-p9W0H25pWDB+GCrwLwuVruX9p8b8kICpp+6I11ym1aw=";
   };
 
@@ -56,10 +56,10 @@ rustPlatform.buildRustPackage rec {
       connection-specific forwarded agents.
     '';
     homepage = "https://github.com/jmmv/ssh-agent-switcher";
-    changelog = "https://github.com/jmmv/ssh-agent-switcher/blob/ssh-agent-switcher-${version}/NEWS.md";
+    changelog = "https://github.com/jmmv/ssh-agent-switcher/blob/ssh-agent-switcher-${finalAttrs.version}/NEWS.md";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.jmmv ];
     mainProgram = "ssh-agent-switcher";
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/st/star-history/package.nix b/pkgs/by-name/st/star-history/package.nix
index 08171a2fe258..fc3c097a8735 100644
--- a/pkgs/by-name/st/star-history/package.nix
+++ b/pkgs/by-name/st/star-history/package.nix
@@ -6,12 +6,12 @@
   openssl,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "star-history";
   version = "1.0.32";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-JilIVnxSXEK525TK+mHal+37G7PYcaQogVC2ozYeLY4=";
   };
 
@@ -31,4 +31,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ lib.maintainers.matthiasbeyer ];
     mainProgram = "star-history";
   };
-}
+})
diff --git a/pkgs/by-name/st/starry/package.nix b/pkgs/by-name/st/starry/package.nix
index e477e6c6464b..b165cf6ec788 100644
--- a/pkgs/by-name/st/starry/package.nix
+++ b/pkgs/by-name/st/starry/package.nix
@@ -6,12 +6,12 @@
   openssl,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "starry";
   version = "2.0.2";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-/ZUmMLEqlpqu+Ja/3XjFJf+OFZJCz7rp5MrQBEjwsXs=";
   };
 
@@ -32,4 +32,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ ];
     mainProgram = "starry";
   };
-}
+})
diff --git a/pkgs/by-name/su/sudachi-rs/package.nix b/pkgs/by-name/su/sudachi-rs/package.nix
index e7f8ad7081eb..cfa5adff59b4 100644
--- a/pkgs/by-name/su/sudachi-rs/package.nix
+++ b/pkgs/by-name/su/sudachi-rs/package.nix
@@ -8,14 +8,14 @@
   writeScript,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sudachi-rs";
   version = "0.6.10";
 
   src = fetchFromGitHub {
     owner = "WorksApplications";
     repo = "sudachi.rs";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-2sJ9diE/EjrQmFcCc4VluE4Gu4RebTYitd7zzfgj3g4=";
   };
 
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
     '';
     tests = {
       # detects an error that sudachidict is not found
-      cli = runCommand "${pname}-cli-test" { } ''
+      cli = runCommand "${finalAttrs.pname}-cli-test" { } ''
         mkdir $out
         echo "高輪ゲートウェイ駅" | ${lib.getExe sudachi-rs} > $out/result
       '';
@@ -58,9 +58,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Japanese morphological analyzer";
     homepage = "https://github.com/WorksApplications/sudachi.rs";
-    changelog = "https://github.com/WorksApplications/sudachi.rs/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/WorksApplications/sudachi.rs/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ natsukium ];
     mainProgram = "sudachi";
   };
-}
+})
diff --git a/pkgs/by-name/sv/svd2rust/package.nix b/pkgs/by-name/sv/svd2rust/package.nix
index 69c4d149f4be..abe33497cf3a 100644
--- a/pkgs/by-name/sv/svd2rust/package.nix
+++ b/pkgs/by-name/sv/svd2rust/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "svd2rust";
   version = "0.37.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-50g5YVmVYTLYJdaWXk91OYdlghDchkyHXS9j2Z7IXSw=";
   };
 
@@ -24,11 +24,11 @@ rustPlatform.buildRustPackage rec {
     description = "Generate Rust register maps (`struct`s) from SVD files";
     mainProgram = "svd2rust";
     homepage = "https://github.com/rust-embedded/svd2rust";
-    changelog = "https://github.com/rust-embedded/svd2rust/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/rust-embedded/svd2rust/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       mit
       asl20
     ];
     maintainers = with lib.maintainers; [ newam ];
   };
-}
+})
diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix
index 5fad65e92739..1e5f2d55b8e1 100644
--- a/pkgs/by-name/sv/svdtools/package.nix
+++ b/pkgs/by-name/sv/svdtools/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "svdtools";
   version = "0.5.0";
 
   src = fetchCrate {
-    inherit version pname;
+    inherit (finalAttrs) version pname;
     hash = "sha256-2GemBVTRvYC5bvlYgJKmDJM78ZoE63B1QwV8cfSHYPg=";
   };
 
@@ -19,11 +19,11 @@ rustPlatform.buildRustPackage rec {
     description = "Tools to handle vendor-supplied, often buggy SVD files";
     mainProgram = "svdtools";
     homepage = "https://github.com/stm32-rs/svdtools";
-    changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-rust.md";
+    changelog = "https://github.com/stm32-rs/svdtools/blob/v${finalAttrs.version}/CHANGELOG-rust.md";
     license = with lib.licenses; [
       asl20 # or
       mit
     ];
     maintainers = with lib.maintainers; [ newam ];
   };
-}
+})
diff --git a/pkgs/by-name/sv/svlint/package.nix b/pkgs/by-name/sv/svlint/package.nix
index 3b8e4a2a246a..ab034ccce9f5 100644
--- a/pkgs/by-name/sv/svlint/package.nix
+++ b/pkgs/by-name/sv/svlint/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "svlint";
   version = "0.9.5";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-RjdhXp9Dm6ZrRfJKsjnzAFgXTIQB3DJmDMwwtQD4Uzw=";
   };
 
@@ -24,8 +24,8 @@ rustPlatform.buildRustPackage rec {
     description = "SystemVerilog linter";
     mainProgram = "svlint";
     homepage = "https://github.com/dalance/svlint";
-    changelog = "https://github.com/dalance/svlint/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/dalance/svlint/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ trepetti ];
   };
-}
+})
diff --git a/pkgs/by-name/sw/swayr/package.nix b/pkgs/by-name/sw/swayr/package.nix
index c10d2d883e3f..00ee429a6385 100644
--- a/pkgs/by-name/sw/swayr/package.nix
+++ b/pkgs/by-name/sw/swayr/package.nix
@@ -4,14 +4,14 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "swayr";
   version = "0.28.2";
 
   src = fetchFromSourcehut {
     owner = "~tsdh";
     repo = "swayr";
-    rev = "swayr-${version}";
+    rev = "swayr-${finalAttrs.version}";
     hash = "sha256-uT8MYgH9kANQ0t+7jqjOOvQIZf5ImdQruZLLlCejwcc=";
   };
 
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   # don't build swayrbar
-  buildAndTestSubdir = pname;
+  buildAndTestSubdir = finalAttrs.pname;
 
   preCheck = ''
     export HOME=$TMPDIR
@@ -36,4 +36,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ artturin ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/sw/swayrbar/package.nix b/pkgs/by-name/sw/swayrbar/package.nix
index 4a83479ba26b..2628029b1765 100644
--- a/pkgs/by-name/sw/swayrbar/package.nix
+++ b/pkgs/by-name/sw/swayrbar/package.nix
@@ -7,21 +7,21 @@
   pulseaudio,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "swayrbar";
   version = "0.5.0";
 
   src = fetchFromSourcehut {
     owner = "~tsdh";
     repo = "swayr";
-    tag = "swayrbar-${version}";
+    tag = "swayrbar-${finalAttrs.version}";
     sha256 = "sha256-uT8MYgH9kANQ0t+7jqjOOvQIZf5ImdQruZLLlCejwcc=";
   };
 
   cargoHash = "sha256-Aj4U2xyfNhf3HDSEd1SQ5TyO2MXn2/hrfnG0ZayzMtU=";
 
   # don't build swayr
-  buildAndTestSubdir = pname;
+  buildAndTestSubdir = finalAttrs.pname;
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -43,4 +43,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ ilkecan ];
     mainProgram = "swayrbar";
   };
-}
+})
diff --git a/pkgs/by-name/sy/syndicate-server/package.nix b/pkgs/by-name/sy/syndicate-server/package.nix
index 4f6219b3596a..a865cef55339 100644
--- a/pkgs/by-name/sy/syndicate-server/package.nix
+++ b/pkgs/by-name/sy/syndicate-server/package.nix
@@ -7,14 +7,14 @@
   versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "syndicate-server";
   version = "0.50.1";
   src = fetchFromGitea {
     domain = "git.syndicate-lang.org";
     owner = "syndicate-lang";
     repo = "syndicate-rs";
-    rev = "${pname}-v${version}";
+    rev = "${finalAttrs.pname}-v${finalAttrs.version}";
     hash = "sha256-orQN83DE+ZNgdx2PVcYrte/rVDFFtuQuRDKzeumpsLo=";
   };
 
@@ -37,4 +37,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "syndicate-server";
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/ta/talecast/package.nix b/pkgs/by-name/ta/talecast/package.nix
index 944f455be6fd..5d5f3a1c25aa 100644
--- a/pkgs/by-name/ta/talecast/package.nix
+++ b/pkgs/by-name/ta/talecast/package.nix
@@ -9,12 +9,12 @@
   talecast,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "talecast";
   version = "0.1.39";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-RwB+X+i3CEcTyKac81he9/cT2aQ4M7AqgqSDBEvhFJU=";
   };
 
@@ -41,4 +41,4 @@ rustPlatform.buildRustPackage rec {
       getchoo
     ];
   };
-}
+})
diff --git a/pkgs/by-name/te/termimage/package.nix b/pkgs/by-name/te/termimage/package.nix
index a709121cf69b..a29e858955b2 100644
--- a/pkgs/by-name/te/termimage/package.nix
+++ b/pkgs/by-name/te/termimage/package.nix
@@ -6,12 +6,12 @@
   ronn,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "termimage";
   version = "1.2.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-1FOPe466GqQfiIpsQT9DJn+FupI2vy9b4+7p31ceY6M=";
   };
 
@@ -32,9 +32,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Display images in your terminal";
     homepage = "https://github.com/nabijaczleweli/termimage";
-    changelog = "https://github.com/nabijaczleweli/termimage/releases/tag/v${version}";
+    changelog = "https://github.com/nabijaczleweli/termimage/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "termimage";
   };
-}
+})
diff --git a/pkgs/by-name/te/textplots/package.nix b/pkgs/by-name/te/textplots/package.nix
index e0954ba32f9f..8745af7752c8 100644
--- a/pkgs/by-name/te/textplots/package.nix
+++ b/pkgs/by-name/te/textplots/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "textplots";
   version = "0.8.5";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-83EAe6O8ETsuGJ5MK6kt68OnJL+r+BAYkFzvzlxHyp4=";
   };
 
@@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ ];
     mainProgram = "textplots";
   };
-}
+})
diff --git a/pkgs/by-name/to/toipe/package.nix b/pkgs/by-name/to/toipe/package.nix
index 8b3269d6bf22..5d045bd6dfb4 100644
--- a/pkgs/by-name/to/toipe/package.nix
+++ b/pkgs/by-name/to/toipe/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "toipe";
   version = "0.5.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-L4JemOxpynGYsA8FgHnMv/hrogLSRaaiIzDjxzZDqjM=";
   };
 
@@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec {
       samyak
     ];
   };
-}
+})
diff --git a/pkgs/by-name/to/toml2json/package.nix b/pkgs/by-name/to/toml2json/package.nix
index 4ad4615abd68..8a9fe91b00f7 100644
--- a/pkgs/by-name/to/toml2json/package.nix
+++ b/pkgs/by-name/to/toml2json/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "toml2json";
   version = "1.4.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-ZqHXtk6bPYm/20DjFhVmrc9+wYAmSEBLxqNgyzPGO2c=";
   };
 
@@ -22,4 +22,4 @@ rustPlatform.buildRustPackage rec {
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ rvarago ];
   };
-}
+})
diff --git a/pkgs/by-name/tr/trashy/package.nix b/pkgs/by-name/tr/trashy/package.nix
index 29f0bf8cc70b..11550cb69e0d 100644
--- a/pkgs/by-name/tr/trashy/package.nix
+++ b/pkgs/by-name/tr/trashy/package.nix
@@ -6,12 +6,12 @@
   stdenv,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "trashy";
   version = "2.0.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-1xHyhAV8hpgMngQdamRzEliyG60t+I3KfsDJi0+180o=";
   };
 
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Simple, fast, and featureful alternative to rm and trash-cli";
     homepage = "https://github.com/oberblastmeister/trashy";
-    changelog = "https://github.com/oberblastmeister/trashy/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/oberblastmeister/trashy/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       asl20 # or
       mit
@@ -41,4 +41,4 @@ rustPlatform.buildRustPackage rec {
     # darwin is unsupported due to https://github.com/Byron/trash-rs/issues/8
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix
index dcb7ab920818..10610883a69c 100644
--- a/pkgs/by-name/tr/treedome/package.nix
+++ b/pkgs/by-name/tr/treedome/package.nix
@@ -17,13 +17,13 @@
   sqlite,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "treedome";
   version = "0.6.1";
 
   src = fetchgit {
     url = "https://codeberg.org/solver-orgz/treedome";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-qa87pgNHGRhP1G4TEFHYrkiJ9AHWG7PUdgxEF4X9EM8=";
     fetchLFS = true;
   };
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-Rg65BiHQF7bBBCtc5F+gY31yhcuI0+IDfxr3pFmxT+w=";
 
   offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
+    yarnLock = "${finalAttrs.src}/yarn.lock";
     hash = "sha256-Q0xsi1xymQne6qN0oxm4YkaDLnGL17iuj70CTdQlxzM=";
   };
 
@@ -59,10 +59,10 @@ rustPlatform.buildRustPackage rec {
   ];
 
   cargoRoot = "src-tauri";
-  buildAndTestSubdir = cargoRoot;
+  buildAndTestSubdir = finalAttrs.cargoRoot;
 
   env = {
-    VERGEN_GIT_DESCRIBE = version;
+    VERGEN_GIT_DESCRIBE = finalAttrs.version;
   };
 
   # WEBKIT_DISABLE_COMPOSITING_MODE essential in NVIDIA + compositor https://github.com/NixOS/nixpkgs/issues/212064#issuecomment-1400202079
@@ -78,6 +78,6 @@ rustPlatform.buildRustPackage rec {
     platforms = [ "x86_64-linux" ];
     mainProgram = "treedome";
     maintainers = with lib.maintainers; [ tengkuizdihar ];
-    changelog = "https://codeberg.org/solver-orgz/treedome/releases/tag/${version}";
+    changelog = "https://codeberg.org/solver-orgz/treedome/releases/tag/${finalAttrs.version}";
   };
-}
+})
diff --git a/pkgs/by-name/tt/ttfb/package.nix b/pkgs/by-name/tt/ttfb/package.nix
index 700d432adc51..2ae7d6ccf528 100644
--- a/pkgs/by-name/tt/ttfb/package.nix
+++ b/pkgs/by-name/tt/ttfb/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ttfb";
   version = "1.15.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-OOVqCWeF5cHMweEGWYIiWWWsw1QlNDFgnia05Qxo7uo=";
   };
 
@@ -28,8 +28,8 @@ rustPlatform.buildRustPackage rec {
       connect, and TLS handshake.
     '';
     homepage = "https://github.com/phip1611/ttfb";
-    changelog = "https://github.com/phip1611/ttfb/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/phip1611/ttfb/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ phip1611 ];
   };
-}
+})
diff --git a/pkgs/by-name/tu/tuifeed/package.nix b/pkgs/by-name/tu/tuifeed/package.nix
index 04f1f2bde729..b3a908863599 100644
--- a/pkgs/by-name/tu/tuifeed/package.nix
+++ b/pkgs/by-name/tu/tuifeed/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tuifeed";
   version = "0.4.2";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-CL6cd9OfvnA5N4W3rGl7XLcnlSrh3kcqA7idxexkjA4=";
   };
 
@@ -24,4 +24,4 @@ rustPlatform.buildRustPackage rec {
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ devhell ];
   };
-}
+})
diff --git a/pkgs/by-name/tw/twiggy/package.nix b/pkgs/by-name/tw/twiggy/package.nix
index 8e05be8b3294..814db9513754 100644
--- a/pkgs/by-name/tw/twiggy/package.nix
+++ b/pkgs/by-name/tw/twiggy/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "twiggy";
   version = "0.8.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-FguDuah3MlC0wgz8VnXV5xepIVhTwYmQzijgX0sbdNY=";
   };
 
@@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [ lucperkins ];
   };
-}
+})
diff --git a/pkgs/by-name/ty/typst-live/package.nix b/pkgs/by-name/ty/typst-live/package.nix
index 9d467741c865..f0ff5bbc17f1 100644
--- a/pkgs/by-name/ty/typst-live/package.nix
+++ b/pkgs/by-name/ty/typst-live/package.nix
@@ -6,12 +6,12 @@
   typst,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typst-live";
   version = "0.8.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-bR4Rhhs6rAC6C1nfPFj/3rCtfEziuTGn5m33CR0qZkU=";
   };
 
@@ -33,4 +33,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ lib.maintainers.matthiasbeyer ];
     mainProgram = "typst-live";
   };
-}
+})
diff --git a/pkgs/by-name/un/unpfs/package.nix b/pkgs/by-name/un/unpfs/package.nix
index 99d7d9662bdf..81afb2c18d84 100644
--- a/pkgs/by-name/un/unpfs/package.nix
+++ b/pkgs/by-name/un/unpfs/package.nix
@@ -4,7 +4,7 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "unpfs";
   version = "0-unstable-2021-04-23";
 
@@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-zyDkUb+bFsVnxAE4UODbnRtDim7gqUNuY22vuxMsLZM=";
   };
 
-  sourceRoot = "${src.name}/example/unpfs";
+  sourceRoot = "${finalAttrs.src.name}/example/unpfs";
 
   cargoHash = "sha256-jRe1lgzfhzBUsS6wwwlqxxomap2TIDOyF3YBv20GJ14=";
 
   env.RUSTC_BOOTSTRAP = 1;
 
   postInstall = ''
-    install -D -m 0444 ../../README* -t "$out/share/doc/${pname}"
-    install -D -m 0444 ../../LICEN* -t "$out/share/doc/${pname}"
+    install -D -m 0444 ../../README* -t "$out/share/doc/${finalAttrs.pname}"
+    install -D -m 0444 ../../LICEN* -t "$out/share/doc/${finalAttrs.pname}"
   '';
 
   meta = {
@@ -36,4 +36,4 @@ rustPlatform.buildRustPackage rec {
     platforms = with lib.platforms; linux;
     mainProgram = "unpfs";
   };
-}
+})
diff --git a/pkgs/by-name/vo/vopono/package.nix b/pkgs/by-name/vo/vopono/package.nix
index 193ea8e1951d..0c3e627aa545 100644
--- a/pkgs/by-name/vo/vopono/package.nix
+++ b/pkgs/by-name/vo/vopono/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "vopono";
   version = "0.10.15";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-78G0Dm0WAEjjud+vrl7n3Uh6NnMQhs3uY4DIeSTKTJs=";
   };
 
@@ -23,4 +23,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ lib.maintainers.romildo ];
     mainProgram = "vopono";
   };
-}
+})
diff --git a/pkgs/by-name/vr/vrc-get/package.nix b/pkgs/by-name/vr/vrc-get/package.nix
index 8ac6ee897fb4..6cfdd0c005a5 100644
--- a/pkgs/by-name/vr/vrc-get/package.nix
+++ b/pkgs/by-name/vr/vrc-get/package.nix
@@ -8,12 +8,12 @@
   buildPackages,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "vrc-get";
   version = "1.9.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-b/rlHfm+AfrluCqoTyBqx86xVaNV3QBGollk5HyD4xk=";
   };
 
@@ -44,4 +44,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ bddvlpr ];
     mainProgram = "vrc-get";
   };
-}
+})
diff --git a/pkgs/by-name/wa/wambo/package.nix b/pkgs/by-name/wa/wambo/package.nix
index 59858ea651a9..79d644b968df 100644
--- a/pkgs/by-name/wa/wambo/package.nix
+++ b/pkgs/by-name/wa/wambo/package.nix
@@ -4,12 +4,12 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wambo";
   version = "0.4.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-3EwNC78DhSXbVFSg6q+66yge4S1m5icJ5nOhoy9qsRI=";
   };
 
@@ -25,8 +25,8 @@ rustPlatform.buildRustPackage rec {
       and so on.
     '';
     homepage = "https://github.com/phip1611/wambo";
-    changelog = "https://github.com/phip1611/wambo/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/phip1611/wambo/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ phip1611 ];
   };
-}
+})
diff --git a/pkgs/by-name/wc/wchisp/package.nix b/pkgs/by-name/wc/wchisp/package.nix
index 1dfd5e55cf15..b9f2952b9a71 100644
--- a/pkgs/by-name/wc/wchisp/package.nix
+++ b/pkgs/by-name/wc/wchisp/package.nix
@@ -9,12 +9,12 @@
   versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wchisp";
   version = "0.3.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-6WNXsRvbldEjAykMn1DCiuKctBrsTHGv1fJuRXBblu0=";
   };
 
@@ -36,11 +36,11 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Command-line implementation of WCHISPTool, for flashing ch32 MCUs";
     homepage = "https://ch32-rs.github.io/wchisp/";
-    changelog = "https://github.com/ch32-rs/wchisp/releases/tag/v${version}";
+    changelog = "https://github.com/ch32-rs/wchisp/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [ gpl2Only ];
     platforms = with lib.platforms; linux ++ darwin ++ windows;
     broken = !stdenv.hostPlatform.isLinux;
     maintainers = with lib.maintainers; [ jwillikers ];
     mainProgram = "wchisp";
   };
-}
+})
diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index dc80579ddf0b..7b7a27b4c3e3 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -26,7 +26,7 @@
   zlib,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wezterm";
   version = "0-unstable-2026-01-17";
 
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   postPatch = ''
-    echo ${version} > .tag
+    echo ${finalAttrs.version} > .tag
 
     # hash does not work well with NixOS
     substituteInPlace assets/shell-integration/wezterm.sh \
@@ -88,7 +88,7 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = ''
     mkdir -p $out/nix-support
-    echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages
+    echo "${finalAttrs.passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages
 
     install -Dm644 assets/icon/terminal.png $out/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png
     install -Dm644 assets/wezterm.desktop $out/share/applications/org.wezfurlong.wezterm.desktop
@@ -142,7 +142,7 @@ rustPlatform.buildRustPackage rec {
         }
         ''
           mkdir -p $out/share/terminfo $out/nix-support
-          tic -x -o $out/share/terminfo ${src}/termwiz/data/wezterm.terminfo
+          tic -x -o $out/share/terminfo ${finalAttrs.src}/termwiz/data/wezterm.terminfo
         '';
 
     tests = {
@@ -163,4 +163,4 @@ rustPlatform.buildRustPackage rec {
       SuperSandro2000
     ];
   };
-}
+})
diff --git a/pkgs/by-name/wh/when-cli/package.nix b/pkgs/by-name/wh/when-cli/package.nix
index 028c4318af26..38ddafd80644 100644
--- a/pkgs/by-name/wh/when-cli/package.nix
+++ b/pkgs/by-name/wh/when-cli/package.nix
@@ -3,12 +3,12 @@
   fetchCrate,
   rustPlatform,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "when-cli";
   version = "0.4.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-LWssrLl2HKul24N3bJdf2ePqeR4PCROrTiVY5sqzB2M=";
   };
 
@@ -21,4 +21,4 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ loicreynier ];
   };
-}
+})
diff --git a/pkgs/by-name/wi/wiremix/package.nix b/pkgs/by-name/wi/wiremix/package.nix
index 3fb9751d0a59..b79ec57956c2 100644
--- a/pkgs/by-name/wi/wiremix/package.nix
+++ b/pkgs/by-name/wi/wiremix/package.nix
@@ -6,12 +6,12 @@
   pipewire,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wiremix";
   version = "0.9.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-gs6KqluASHTf4fURZKEmNvERguQEH5UDc4044uJddrU=";
   };
 
@@ -34,4 +34,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ tsowell ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix
index 3f106d649f5a..38b720e12d4f 100644
--- a/pkgs/by-name/wl/wleave/package.nix
+++ b/pkgs/by-name/wl/wleave/package.nix
@@ -17,14 +17,14 @@
   librsvg,
   libxml2,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wleave";
   version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "AMNatty";
     repo = "wleave";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-+0EKnaxRaHRxRvhASuvfpUijEZJFimR4zSzOyC3FOkQ=";
   };
 
@@ -49,10 +49,10 @@ rustPlatform.buildRustPackage rec {
 
   postPatch = ''
     substituteInPlace src/config.rs \
-      --replace-fail "/etc/wleave" "$out/etc/${pname}"
+      --replace-fail "/etc/wleave" "$out/etc/${finalAttrs.pname}"
 
     substituteInPlace layout.json \
-      --replace-fail "/usr/share/wleave" "$out/share/${pname}"
+      --replace-fail "/usr/share/wleave" "$out/share/${finalAttrs.pname}"
   '';
 
   postInstall = ''
@@ -81,4 +81,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ ludovicopiero ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/wl/wlink/package.nix b/pkgs/by-name/wl/wlink/package.nix
index d4a3cfcf9b50..15d577b1d76a 100644
--- a/pkgs/by-name/wl/wlink/package.nix
+++ b/pkgs/by-name/wl/wlink/package.nix
@@ -10,12 +10,12 @@
   versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wlink";
   version = "0.1.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-YxozhEJh/KBirlA6ymIEbJY3r7wYSeTL40W2xQLyue0=";
   };
 
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "WCH-Link flash tool for WCH's RISC-V MCUs(CH32V, CH56X, CH57X, CH58X, CH59X, CH32L103, CH32X035, CH641, CH643)";
     homepage = "https://github.com/ch32-rs/wlink";
-    changelog = "https://github.com/ch32-rs/wlink/releases/tag/v${version}";
+    changelog = "https://github.com/ch32-rs/wlink/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [
       mit # or
       asl20
@@ -48,4 +48,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ jwillikers ];
     mainProgram = "wlink";
   };
-}
+})
diff --git a/pkgs/by-name/wy/wyvern/package.nix b/pkgs/by-name/wy/wyvern/package.nix
index 4147598dc0f9..a857de845e07 100644
--- a/pkgs/by-name/wy/wyvern/package.nix
+++ b/pkgs/by-name/wy/wyvern/package.nix
@@ -7,12 +7,12 @@
   openssl,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wyvern";
   version = "1.4.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-OjL3wEoh4fT2nKqb7lMefP5B0vYyUaTRj09OXPEVfW4=";
   };
 
@@ -34,4 +34,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ _0x4A6F ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/xq/xq/package.nix b/pkgs/by-name/xq/xq/package.nix
index 560b34e17fd7..891f566119b9 100644
--- a/pkgs/by-name/xq/xq/package.nix
+++ b/pkgs/by-name/xq/xq/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xq";
   version = "0.4.1";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Qe+crretlKJRoNPO2+aHxCmMO9MecqGjOuvdhr4a0NU=";
   };
 
@@ -25,4 +25,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ matthewcroughan ];
     mainProgram = "xq";
   };
-}
+})
diff --git a/pkgs/by-name/zb/zbus-xmlgen/package.nix b/pkgs/by-name/zb/zbus-xmlgen/package.nix
index 2813bad39a43..34546ffe72c6 100644
--- a/pkgs/by-name/zb/zbus-xmlgen/package.nix
+++ b/pkgs/by-name/zb/zbus-xmlgen/package.nix
@@ -6,12 +6,12 @@
   rustfmt,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zbus_xmlgen";
   version = "5.2.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-CFXOPUWjbzNkE8mb+AC4ZtdvV0MSb/eBr1C0WyreAoU=";
   };
 
@@ -32,4 +32,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ qyliss ];
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/by-name/zi/zine/package.nix b/pkgs/by-name/zi/zine/package.nix
index 786afde2d789..9a9e3349f052 100644
--- a/pkgs/by-name/zi/zine/package.nix
+++ b/pkgs/by-name/zi/zine/package.nix
@@ -6,12 +6,12 @@
   openssl,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zine";
   version = "0.16.0";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-pUoMMgZQ+oDs9Yhc1rQuy9cUWiR800DlIe8wxQjnIis=";
   };
 
@@ -33,11 +33,11 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Simple and opinionated tool to build your own magazine";
     homepage = "https://github.com/zineland/zine";
-    changelog = "https://github.com/zineland/zine/releases/tag/v${version}";
+    changelog = "https://github.com/zineland/zine/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       dit7ya
     ];
     mainProgram = "zine";
   };
-}
+})

From 3f9a09b808a812367fa997c63d7cc918458ef94e Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sun, 22 Feb 2026 04:49:18 +0100
Subject: [PATCH 47/50] various: fix pname misuse in buildRustApplication
 packages

after this all uses of 'inherit (finalAttrs) pname;' or 'finalAttrs.pname'
in these packages are in my opinion legit uses. e.g.:
- for inheriting the pname and version in fetchPnpmDeps, fetchCargoDeps or fetchCrate
- for use in creating the (p-)name of small sub-packages like tests or updateScripts.
- for cargoDepsName
- for buildAndTestSubdir
---
 pkgs/by-name/am/amdgpu_top/package.nix       | 2 +-
 pkgs/by-name/au/authoscope/package.nix       | 2 +-
 pkgs/by-name/br/browsers/package.nix         | 2 +-
 pkgs/by-name/ca/cargo-cyclonedx/package.nix  | 2 +-
 pkgs/by-name/en/engage/package.nix           | 4 ++--
 pkgs/by-name/fu/furtherance/package.nix      | 2 +-
 pkgs/by-name/ha/halloy/package.nix           | 2 +-
 pkgs/by-name/jf/jfmt/package.nix             | 2 +-
 pkgs/by-name/md/mdbook-katex/package.nix     | 2 +-
 pkgs/by-name/ne/nethoscope/package.nix       | 2 +-
 pkgs/by-name/rc/rclone-ui/package.nix        | 2 +-
 pkgs/by-name/sa/safe-rm/package.nix          | 2 +-
 pkgs/by-name/sh/shh/package.nix              | 6 +++---
 pkgs/by-name/si/similarity/package.nix       | 2 +-
 pkgs/by-name/sy/syndicate-server/package.nix | 2 +-
 pkgs/by-name/un/unpfs/package.nix            | 4 ++--
 pkgs/by-name/wl/wleave/package.nix           | 4 ++--
 17 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix
index b56bfde91e81..cec01b1898d2 100644
--- a/pkgs/by-name/am/amdgpu_top/package.nix
+++ b/pkgs/by-name/am/amdgpu_top/package.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   postFixup = ''
-    patchelf --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" $out/bin/${finalAttrs.pname}
+    patchelf --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" $out/bin/${finalAttrs.meta.mainProgram}
   '';
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/au/authoscope/package.nix b/pkgs/by-name/au/authoscope/package.nix
index 33f69185e491..a03421e2278a 100644
--- a/pkgs/by-name/au/authoscope/package.nix
+++ b/pkgs/by-name/au/authoscope/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   postInstall = ''
-    installManPage docs/${finalAttrs.pname}.1
+    installManPage docs/authoscope.1
   '';
 
   # Tests requires access to httpin.org
diff --git a/pkgs/by-name/br/browsers/package.nix b/pkgs/by-name/br/browsers/package.nix
index ad0227477728..d17f73efcb8d 100644
--- a/pkgs/by-name/br/browsers/package.nix
+++ b/pkgs/by-name/br/browsers/package.nix
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mv $out/share/applications/software.Browsers.template.desktop $out/share/applications/software.Browsers.desktop
     substituteInPlace \
         $out/share/applications/software.Browsers.desktop \
-        --replace-fail 'Exec=€ExecCommand€' 'Exec=${finalAttrs.pname} %u'
+        --replace-fail 'Exec=€ExecCommand€' 'Exec=${finalAttrs.meta.mainProgram} %u'
     cp -r resources $out
     for size in 16 32 128 256 512; do
       install -m 444 \
diff --git a/pkgs/by-name/ca/cargo-cyclonedx/package.nix b/pkgs/by-name/ca/cargo-cyclonedx/package.nix
index b0335bf0799d..94eb1dc807d4 100644
--- a/pkgs/by-name/ca/cargo-cyclonedx/package.nix
+++ b/pkgs/by-name/ca/cargo-cyclonedx/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-rust-cargo";
-    rev = "${finalAttrs.pname}-${finalAttrs.version}";
+    rev = "cargo-cyclonedx-${finalAttrs.version}";
     hash = "sha256-T/9eHI2P8eCZAqMTeZz1yEi5nljQWfHrdNiU3h3h74U=";
   };
 
diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix
index 2d57f8307c77..7c1fc1f965ae 100644
--- a/pkgs/by-name/en/engage/package.nix
+++ b/pkgs/by-name/en/engage/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   env = {
-    ENGAGE_DOCS_LINK = "file://${placeholder "doc"}/share/doc/${finalAttrs.pname}/index.html";
+    ENGAGE_DOCS_LINK = "file://${placeholder "doc"}/share/doc/engage/index.html";
   };
 
   src = fetchFromGitLab {
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     ${lib.getExe mdbook} build
     mkdir -p "$doc/share/doc"
-    mv public "$doc/share/doc/${finalAttrs.pname}"
+    mv public "$doc/share/doc/engage"
   '';
 
   meta = {
diff --git a/pkgs/by-name/fu/furtherance/package.nix b/pkgs/by-name/fu/furtherance/package.nix
index 88d16f3e5f46..40265eeddc54 100644
--- a/pkgs/by-name/fu/furtherance/package.nix
+++ b/pkgs/by-name/fu/furtherance/package.nix
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
-    patchelf $out/bin/${finalAttrs.pname} \
+    patchelf $out/bin/${finalAttrs.meta.mainProgram} \
       --add-rpath ${
         lib.makeLibraryPath [
           vulkan-loader
diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index 936a5aedb254..8d4932a0e1b7 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       desktopName = "Halloy";
       comment = "IRC client written in Rust";
       icon = "org.squidowl.halloy";
-      exec = finalAttrs.pname;
+      exec = finalAttrs.meta.mainProgram;
       terminal = false;
       mimeTypes = [
         "x-scheme-handler/irc"
diff --git a/pkgs/by-name/jf/jfmt/package.nix b/pkgs/by-name/jf/jfmt/package.nix
index fdcc8ab9c69b..bfb31436d274 100644
--- a/pkgs/by-name/jf/jfmt/package.nix
+++ b/pkgs/by-name/jf/jfmt/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "scruffystuffs";
-    repo = "${finalAttrs.pname}.rs";
+    repo = "jfmt.rs";
     rev = "v${finalAttrs.version}";
     hash = "sha256-X3wk669G07BTPAT5xGbAfIu2Qk90aaJIi1CLmOnSG80=";
   };
diff --git a/pkgs/by-name/md/mdbook-katex/package.nix b/pkgs/by-name/md/mdbook-katex/package.nix
index 37d8826f09a5..d46f185af21a 100644
--- a/pkgs/by-name/md/mdbook-katex/package.nix
+++ b/pkgs/by-name/md/mdbook-katex/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time";
     mainProgram = "mdbook-katex";
-    homepage = "https://github.com/lzanini/${finalAttrs.pname}";
+    homepage = "https://github.com/lzanini/mdbook-katex";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       lovesegfault
diff --git a/pkgs/by-name/ne/nethoscope/package.nix b/pkgs/by-name/ne/nethoscope/package.nix
index 8bc21edc41bd..0c88f51bc0d6 100644
--- a/pkgs/by-name/ne/nethoscope/package.nix
+++ b/pkgs/by-name/ne/nethoscope/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   installCheckPhase = ''
-    if [[ "$(${expect}/bin/unbuffer "$out/bin/${finalAttrs.pname}" --help 2> /dev/null | strings | grep ${finalAttrs.version} | tr -d '\n')" == " ${finalAttrs.version}" ]]; then
+    if [[ "$(${expect}/bin/unbuffer "$out/bin/${finalAttrs.meta.mainProgram}" --help 2> /dev/null | strings | grep ${finalAttrs.version} | tr -d '\n')" == " ${finalAttrs.version}" ]]; then
       echo '${finalAttrs.pname} smoke check passed'
     else
       echo '${finalAttrs.pname} smoke check failed'
diff --git a/pkgs/by-name/rc/rclone-ui/package.nix b/pkgs/by-name/rc/rclone-ui/package.nix
index 8fe408e1d7ce..b89245f10ba0 100644
--- a/pkgs/by-name/rc/rclone-ui/package.nix
+++ b/pkgs/by-name/rc/rclone-ui/package.nix
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postPatch = ''
     substituteInPlace src-tauri/tauri.conf.json \
-      --replace-fail '"mainBinaryName": "Rclone UI"' '"mainBinaryName": "${finalAttrs.pname}"'
+      --replace-fail '"mainBinaryName": "Rclone UI"' '"mainBinaryName": "${finalAttrs.meta.mainProgram}"'
     substituteInPlace src-tauri/Cargo.toml \
        --replace-fail 'name = "app"' 'name = "${finalAttrs.pname}"'
   '';
diff --git a/pkgs/by-name/sa/safe-rm/package.nix b/pkgs/by-name/sa/safe-rm/package.nix
index aac13f960d2f..d82c0a55d48a 100644
--- a/pkgs/by-name/sa/safe-rm/package.nix
+++ b/pkgs/by-name/sa/safe-rm/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   src = fetchgit {
     url = "https://git.launchpad.net/safe-rm";
-    tag = "${finalAttrs.pname}-${finalAttrs.version}";
+    tag = "safe-rm-${finalAttrs.version}";
     sha256 = "sha256-7+4XwsjzLBCQmHDYNwhlN4Yg3eL43GUEbq8ROtuP2Kw=";
   };
 
diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix
index 8bfe3869fdf4..429634129b24 100644
--- a/pkgs/by-name/sh/shh/package.nix
+++ b/pkgs/by-name/sh/shh/package.nix
@@ -85,9 +85,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     installManPage target/mangen/*
 
-    installShellCompletion --cmd ${finalAttrs.pname} \
-      target/shellcomplete/${finalAttrs.pname}.{bash,fish} \
-      --zsh target/shellcomplete/_${finalAttrs.pname}
+    installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \
+      target/shellcomplete/${finalAttrs.meta.mainProgram}.{bash,fish} \
+      --zsh target/shellcomplete/_${finalAttrs.meta.mainProgram}
   '';
 
   # RUST_BACKTRACE = 1;
diff --git a/pkgs/by-name/si/similarity/package.nix b/pkgs/by-name/si/similarity/package.nix
index 7ee56ceacbf2..95d384534cb8 100644
--- a/pkgs/by-name/si/similarity/package.nix
+++ b/pkgs/by-name/si/similarity/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-7qLC1RvjBXd9JFrJdDTIngZhMvyQV1ko3MXRr/2y7hA=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.pname}-ts";
+  versionCheckProgram = "${placeholder "out"}/bin/similarity-ts";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/sy/syndicate-server/package.nix b/pkgs/by-name/sy/syndicate-server/package.nix
index a865cef55339..31e17ac2e43f 100644
--- a/pkgs/by-name/sy/syndicate-server/package.nix
+++ b/pkgs/by-name/sy/syndicate-server/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     domain = "git.syndicate-lang.org";
     owner = "syndicate-lang";
     repo = "syndicate-rs";
-    rev = "${finalAttrs.pname}-v${finalAttrs.version}";
+    rev = "syndicate-server-v${finalAttrs.version}";
     hash = "sha256-orQN83DE+ZNgdx2PVcYrte/rVDFFtuQuRDKzeumpsLo=";
   };
 
diff --git a/pkgs/by-name/un/unpfs/package.nix b/pkgs/by-name/un/unpfs/package.nix
index 81afb2c18d84..046848534e8a 100644
--- a/pkgs/by-name/un/unpfs/package.nix
+++ b/pkgs/by-name/un/unpfs/package.nix
@@ -22,8 +22,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   env.RUSTC_BOOTSTRAP = 1;
 
   postInstall = ''
-    install -D -m 0444 ../../README* -t "$out/share/doc/${finalAttrs.pname}"
-    install -D -m 0444 ../../LICEN* -t "$out/share/doc/${finalAttrs.pname}"
+    install -D -m 0444 ../../README* -t "$out/share/doc/unpfs"
+    install -D -m 0444 ../../LICEN* -t "$out/share/doc/unpfs"
   '';
 
   meta = {
diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix
index 38b720e12d4f..e2dfe0dd73ec 100644
--- a/pkgs/by-name/wl/wleave/package.nix
+++ b/pkgs/by-name/wl/wleave/package.nix
@@ -49,10 +49,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postPatch = ''
     substituteInPlace src/config.rs \
-      --replace-fail "/etc/wleave" "$out/etc/${finalAttrs.pname}"
+      --replace-fail "/etc/wleave" "$out/etc/wleave"
 
     substituteInPlace layout.json \
-      --replace-fail "/usr/share/wleave" "$out/share/${finalAttrs.pname}"
+      --replace-fail "/usr/share/wleave" "$out/share/wleave"
   '';
 
   postInstall = ''

From e61e7980a389f4dec7c719d2eb4a1eec69ee5715 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 6 Mar 2026 10:55:53 +0000
Subject: [PATCH 48/50] radicle-native-ci: 0.12.0 -> 0.13.0

Changelog: https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE/tree/NEWS.md
---
 pkgs/by-name/ra/radicle-native-ci/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-native-ci/package.nix b/pkgs/by-name/ra/radicle-native-ci/package.nix
index cde2a8d630ef..e0e51db4d816 100644
--- a/pkgs/by-name/ra/radicle-native-ci/package.nix
+++ b/pkgs/by-name/ra/radicle-native-ci/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radicle-native-ci";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromRadicle {
     seed = "seed.radicle.xyz";
     repo = "z3qg5TKmN83afz2fj9z3fQjU8vaYE";
     node = "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Hi5QdYVFSvP8AEKcH7yIA7PpaTSe0hBcF3vgCNilCKg=";
+    hash = "sha256-FCuyOgBjwK4GNOFku0loNRwjrQ8emvhHWq1pOE/QL3s=";
   };
 
-  cargoHash = "sha256-N1XyMarKCctor5r7AePMuV/BzWiQwXphJFqye0cqO3k=";
+  cargoHash = "sha256-zA71hm5/8Pu9aUgBq8PetSnE8Ah1wu1ItOoGE8YfQR0=";
 
   preCheck = ''
     git config --global user.name nixbld

From 9271004f8475aaac7f45113f50136cc330b2851b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2026 11:05:00 +0000
Subject: [PATCH 49/50] terraform-providers.f5networks_bigip: 1.24.2 -> 1.25.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 003c979bccb2..2903c977be4c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -391,11 +391,11 @@
     "vendorHash": null
   },
   "f5networks_bigip": {
-    "hash": "sha256-V+CA+8nICGzj0etByXZzaO/GMIFGA0fzG0PW1FH7Qxw=",
+    "hash": "sha256-aUf9eRpfxzdpz6Lv36xWxSW++tSMxYvqy9xtkko/bfc=",
     "homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
     "owner": "F5Networks",
     "repo": "terraform-provider-bigip",
-    "rev": "v1.24.2",
+    "rev": "v1.25.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From efe60c90558a929c1b523d6b87db1f6f396c3ad5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2026 11:28:42 +0000
Subject: [PATCH 50/50] terraform-providers.hashicorp_tfe: 0.74.0 -> 0.74.1

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 003c979bccb2..cf8d347b6108 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -652,11 +652,11 @@
     "vendorHash": "sha256-GlkqFg9Bgs+Hi59PYAxqq3YW9ji1qeuX4vz59wQ4pRw="
   },
   "hashicorp_tfe": {
-    "hash": "sha256-+FIiatVTff/MNk1Ik0vZDii7yjeWQLO5BLqSrs2bGME=",
+    "hash": "sha256-dak9/lYjL+2gbXyjxRqS61wr4YJRHFzHNJdCPJqiaW4=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
     "owner": "hashicorp",
     "repo": "terraform-provider-tfe",
-    "rev": "v0.74.0",
+    "rev": "v0.74.1",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-GAwAGw8N4B/jCtcR2ok3g/0j//CHK9yPaBj+otJLjKc="
   },