diff --git a/pkgs/by-name/al/aldo/package.nix b/pkgs/by-name/al/aldo/package.nix
index 255a43bb12c4..19268221fe46 100644
--- a/pkgs/by-name/al/aldo/package.nix
+++ b/pkgs/by-name/al/aldo/package.nix
@@ -6,16 +6,13 @@
   autoreconfHook,
 }:
 
-let
+stdenv.mkDerivation (finalAttrs: {
   pname = "aldo";
   version = "0.7.8";
-in
-stdenv.mkDerivation {
-  inherit pname version;
 
   src = fetchgit {
     url = "git://git.savannah.gnu.org/aldo.git";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "0swvdq0pw1msy40qkpn1ar9kacqjyrw2azvf2fy38y0svyac8z2i";
   };
 
@@ -31,4 +28,4 @@ stdenv.mkDerivation {
     platforms = lib.platforms.linux;
     mainProgram = "aldo";
   };
-}
+})
diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix
index 226d4ddf51eb..d65ad4b8a0bc 100644
--- a/pkgs/by-name/as/asm-lsp/package.nix
+++ b/pkgs/by-name/as/asm-lsp/package.nix
@@ -6,17 +6,15 @@
   pkg-config,
   openssl,
 }:
-let
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "asm-lsp";
   version = "0.10.1";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "bergercookie";
     repo = "asm-lsp";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-vEilIoIK6fxZBhmyDueP2zvbh1/t2wd4cnq/0y6p+TI=";
   };
 
@@ -42,4 +40,4 @@ rustPlatform.buildRustPackage {
     mainProgram = "asm-lsp";
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/at/atomic-swap/package.nix b/pkgs/by-name/at/atomic-swap/package.nix
index 0d3d52c2f62d..37c1125600bb 100644
--- a/pkgs/by-name/at/atomic-swap/package.nix
+++ b/pkgs/by-name/at/atomic-swap/package.nix
@@ -7,17 +7,14 @@
   monero-cli,
 }:
 
-let
+buildGoModule (finalAttrs: {
   pname = "atomic-swap";
   version = "0.4.3";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "AthanorLabs";
     repo = "atomic-swap";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-MOylUZ6BrvlxUrsZ5gg3JzW9ROG5UXeGhq3YoPZKdHs=";
   };
 
@@ -42,7 +39,7 @@ buildGoModule {
 
   meta = {
     homepage = "https://github.com/AthanorLabs/atomic-swap";
-    changelog = "https://github.com/AthanorLabs/atomic-swap/releases/tag/v${version}";
+    changelog = "https://github.com/AthanorLabs/atomic-swap/releases/tag/v${finalAttrs.version}";
     description = "ETH-XMR atomic swap implementation";
     license = with lib.licenses; [ lgpl3Only ];
     maintainers = with lib.maintainers; [
@@ -50,4 +47,4 @@ buildGoModule {
       lord-valen
     ];
   };
-}
+})
diff --git a/pkgs/by-name/av/avro-tools/package.nix b/pkgs/by-name/av/avro-tools/package.nix
index b4d831af3bf4..962349c2119f 100644
--- a/pkgs/by-name/av/avro-tools/package.nix
+++ b/pkgs/by-name/av/avro-tools/package.nix
@@ -5,31 +5,29 @@
   jre,
   lib,
 }:
-let
+stdenv.mkDerivation (finalAttrs: {
   pname = "avro-tools";
   version = "1.12.0";
-in
-stdenv.mkDerivation {
-  inherit pname version;
 
   src = fetchurl {
-    url = "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar";
+    url = "mirror://maven/org/apache/avro/avro-tools/${finalAttrs.version}/avro-tools-${finalAttrs.version}.jar";
     sha256 = "sha256-+OTQ2UWFLcL5HDv4j33LjKvADg/ClbuS6JPlSUXggIU=";
   };
+  sourceRoot = ".";
 
-  dontUnpack = true;
+  nativeBuildInputs = [ makeWrapper ];
 
   buildInputs = [ jre ];
-  nativeBuildInputs = [ makeWrapper ];
-  sourceRoot = ".";
+
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p $out/bin
     mkdir -p $out/libexec/avro-tools
-    cp $src $out/libexec/avro-tools/${pname}.jar
+    cp $src $out/libexec/avro-tools/avro-tools.jar
 
     makeWrapper ${jre}/bin/java $out/bin/avro-tools \
-    --add-flags "-jar $out/libexec/avro-tools/${pname}.jar"
+    --add-flags "-jar $out/libexec/avro-tools/avro-tools.jar"
   '';
 
   meta = {
@@ -40,4 +38,4 @@ stdenv.mkDerivation {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ momeemt ];
   };
-}
+})
diff --git a/pkgs/by-name/ba/base16-shell-preview/package.nix b/pkgs/by-name/ba/base16-shell-preview/package.nix
index d31452023906..96155499eaa4 100644
--- a/pkgs/by-name/ba/base16-shell-preview/package.nix
+++ b/pkgs/by-name/ba/base16-shell-preview/package.nix
@@ -4,17 +4,14 @@
   fetchPypi,
 }:
 
-let
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "base16-shell-preview";
   version = "1.1.0";
-in
-python3Packages.buildPythonApplication {
-  inherit pname version;
   pyproject = true;
 
   src = fetchPypi {
-    inherit version;
-    pname = "${lib.replaceStrings [ "-" ] [ "_" ] pname}";
+    inherit (finalAttrs) version;
+    pname = "${lib.replaceStrings [ "-" ] [ "_" ] finalAttrs.pname}";
     hash = "sha256-UWS1weiccSGqBU8grPAUKkuXb7qs5wliHVaPgdW4KtI=";
   };
 
@@ -33,4 +30,4 @@ python3Packages.buildPythonApplication {
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/bi/bigquery-emulator/package.nix b/pkgs/by-name/bi/bigquery-emulator/package.nix
index bda65e4a026d..933570797da3 100644
--- a/pkgs/by-name/bi/bigquery-emulator/package.nix
+++ b/pkgs/by-name/bi/bigquery-emulator/package.nix
@@ -4,21 +4,19 @@
   fetchFromGitHub,
   lib,
 }:
-let
-  version = "0.6.6";
-  pname = "bigquery-emulator";
-in
+
 buildGoModule.override
   {
     stdenv = pkgs.clangStdenv;
   }
-  {
-    inherit pname version;
+  (finalAttrs: {
+    version = "0.6.6";
+    pname = "bigquery-emulator";
 
     src = fetchFromGitHub {
       owner = "goccy";
       repo = "bigquery-emulator";
-      tag = "v${version}";
+      tag = "v${finalAttrs.version}";
       hash = "sha256-iAVbxbm1G7FIWTB5g6Ff8h2dZjZssONA2MOCGuvK180=";
     };
 
@@ -29,16 +27,16 @@ buildGoModule.override
       rm -r internal/cmd/generator
     '';
 
-    ldflags = [ "-s -w -X main.version=${version} -X main.revision=v${version}" ];
+    ldflags = [ "-s -w -X main.version=${finalAttrs.version} -X main.revision=v${finalAttrs.version}" ];
 
     doCheck = false;
 
     meta = {
       description = "BigQuery emulator server implemented in Go";
       homepage = "https://github.com/goccy/bigquery-emulator";
-      changelog = "https://github.com/goccy/pname/releases/tag/v${version}";
+      changelog = "https://github.com/goccy/pname/releases/tag/v${finalAttrs.version}";
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [ tarantoj ];
       mainProgram = "bigquery-emulator";
     };
-  }
+  })
diff --git a/pkgs/by-name/bm/bms-to-osu/package.nix b/pkgs/by-name/bm/bms-to-osu/package.nix
index adfa44349422..457eaa17e51d 100644
--- a/pkgs/by-name/bm/bms-to-osu/package.nix
+++ b/pkgs/by-name/bm/bms-to-osu/package.nix
@@ -6,12 +6,9 @@
   ffmpeg,
 }:
 
-let
+buildDotnetModule {
   pname = "bms-to-osu";
   version = "2.5-unstable-2025-01-14"; # 2.5 crashes at runtime due to missing kernel32.dll
-in
-buildDotnetModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "QingQiz";
diff --git a/pkgs/by-name/bp/bpftop/package.nix b/pkgs/by-name/bp/bpftop/package.nix
index d6585257cc9b..07568f1b1556 100644
--- a/pkgs/by-name/bp/bpftop/package.nix
+++ b/pkgs/by-name/bp/bpftop/package.nix
@@ -8,16 +8,14 @@
   libbpf,
   clangStdenv,
 }:
-let
+rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
   pname = "bpftop";
   version = "0.7.1";
-in
-rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } {
-  inherit pname version;
+
   src = fetchFromGitHub {
     owner = "Netflix";
     repo = "bpftop";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-8vb32+wHOnADpIIfO9mMlGu7GdlA0hS9ij0zSLcrO7A=";
   };
 
@@ -46,4 +44,4 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } {
     ];
     mainProgram = "bpftop";
   };
-}
+})
diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix
index ead0880b2857..b1dc9f933c8d 100644
--- a/pkgs/by-name/bu/buildpack/package.nix
+++ b/pkgs/by-name/bu/buildpack/package.nix
@@ -6,17 +6,14 @@
   installShellFiles,
 }:
 
-let
+buildGoModule (finalAttrs: {
   pname = "pack";
   version = "0.37.0";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = "pack";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-QCN0UvWa5u9XX5LvY3yD8Xz2s1XzZUg/WXnAfWwZnY0=";
   };
 
@@ -29,7 +26,7 @@ buildGoModule {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/buildpacks/pack.Version=${version}"
+    "-X github.com/buildpacks/pack.Version=${finalAttrs.version}"
   ];
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
@@ -41,10 +38,10 @@ buildGoModule {
 
   meta = {
     homepage = "https://buildpacks.io/";
-    changelog = "https://github.com/buildpacks/pack/releases/tag/v${version}";
+    changelog = "https://github.com/buildpacks/pack/releases/tag/v${finalAttrs.version}";
     description = "CLI for building apps using Cloud Native Buildpacks";
     mainProgram = "pack";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ momeemt ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cabal-cli/package.nix b/pkgs/by-name/ca/cabal-cli/package.nix
index 11cb241ad18f..1ef0362a8e9b 100644
--- a/pkgs/by-name/ca/cabal-cli/package.nix
+++ b/pkgs/by-name/ca/cabal-cli/package.nix
@@ -4,17 +4,14 @@
   fetchFromGitHub,
 }:
 
-let
-  version = "15.0.2";
+buildNpmPackage (finalAttrs: {
   pname = "cabal-cli";
-in
-buildNpmPackage {
-  inherit version pname;
+  version = "15.0.2";
 
   src = fetchFromGitHub {
     owner = "cabal-club";
     repo = "cabal-cli";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-DZ+F+pgPc8WuiBhLgxNO5es5lA996fJdvZyg6QjfrHg=";
   };
 
@@ -30,4 +27,4 @@ buildNpmPackage {
     license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ kototama ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix
index d7d8b6830443..ecb7bddbd8fc 100644
--- a/pkgs/by-name/ca/cargo-mobile2/package.nix
+++ b/pkgs/by-name/ca/cargo-mobile2/package.nix
@@ -8,16 +8,14 @@
   makeWrapper,
 }:
 
-let
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-mobile2";
   version = "0.22.2";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
+
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "cargo-mobile2";
-    rev = "cargo-mobile2-v${version}";
+    rev = "cargo-mobile2-v${finalAttrs.version}";
     hash = "sha256-pSp7w823Jjjg0PEnCc7jVLBbOgvR7JAjtD8OK5voC0A=";
   };
 
@@ -27,12 +25,6 @@ rustPlatform.buildRustPackage {
 
   cargoHash = "sha256-aci1QF/O2J6Yix4UkxPCVW+c+xoqm7AvdhlkF7y1GqA=";
 
-  preBuild = ''
-    mkdir -p $out/share/
-    # during the install process tauri-mobile puts templates and commit information in CARGO_HOME
-    export CARGO_HOME=$out/share/
-  '';
-
   buildInputs = [ openssl ];
   nativeBuildInputs = [
     pkg-config
@@ -40,6 +32,12 @@ rustPlatform.buildRustPackage {
     makeWrapper
   ];
 
+  preBuild = ''
+    mkdir -p $out/share/
+    # during the install process tauri-mobile puts templates and commit information in CARGO_HOME
+    export CARGO_HOME=$out/share/
+  '';
+
   preFixup = ''
     for bin in $out/bin/cargo-*; do
       wrapProgram $bin \
@@ -56,4 +54,4 @@ rustPlatform.buildRustPackage {
     ];
     maintainers = with lib.maintainers; [ happysalada ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cavasik/package.nix b/pkgs/by-name/ca/cavasik/package.nix
index 6b28bd7753bb..6e55cee0ad52 100644
--- a/pkgs/by-name/ca/cavasik/package.nix
+++ b/pkgs/by-name/ca/cavasik/package.nix
@@ -15,19 +15,16 @@
   wrapGAppsHook4,
 }:
 
-let
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "cavasik";
   version = "3.2.0";
-in
-python3Packages.buildPythonApplication {
-  inherit pname version;
 
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "TheWisker";
     repo = "Cavasik";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-O8rFtqzmDktXKF3219RAo1yxqjfPm1qkHhAyoT7N8AU=";
   };
 
@@ -80,4 +77,4 @@ python3Packages.buildPythonApplication {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ starryreverie ];
   };
-}
+})
diff --git a/pkgs/by-name/do/documenso/package.nix b/pkgs/by-name/do/documenso/package.nix
index 7d2f14d63774..c6978b7ddfaf 100644
--- a/pkgs/by-name/do/documenso/package.nix
+++ b/pkgs/by-name/do/documenso/package.nix
@@ -15,32 +15,26 @@
   bash,
   openssl,
 }:
-let
+
+buildNpmPackage (finalAttrs: {
   pname = "documenso";
   version = "1.12.6";
-in
-buildNpmPackage {
-
-  inherit version pname;
 
   src = fetchFromGitHub {
     owner = "documenso";
     repo = "documenso";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-1TKjsOKJkv3COFgsE4tPAymI0MdeT+T8HiNgnoWHlAY=";
   };
 
+  patches = [
+    ./package-lock.json.patch
+    ./package.json.patch
+    ./turbo.json.patch
+  ];
+
   npmDepsHash = "sha256-ZddRSBDasa3mMAS2dqXgXRMOc1nvspdXsuTZ7c+einw=";
 
-  env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
-
-  env.PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines_6}/lib/libquery_engine.node";
-  env.PRISMA_QUERY_ENGINE_BINARY = "${prisma-engines_6}/bin/query-engine";
-  env.PRISMA_SCHEMA_ENGINE_BINARY = "${prisma-engines_6}/bin/schema-engine";
-  env.TURBO_NO_UPDATE_NOTIFIER = "true";
-  env.TURBO_FORCE = "true";
-  env.TURBO_REMOTE_CACHE_ENABLED = "false";
-
   nativeBuildInputs = [
     pkg-config
     vips
@@ -56,11 +50,15 @@ buildNpmPackage {
     vips
   ];
 
-  patches = [
-    ./package-lock.json.patch
-    ./package.json.patch
-    ./turbo.json.patch
-  ];
+  env = {
+    PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
+    PRISMA_QUERY_ENGINE_LIBRARY = "${lib.getLib prisma-engines_6}/lib/libquery_engine.node";
+    PRISMA_QUERY_ENGINE_BINARY = lib.getExe' prisma-engines_6 "query-engine";
+    PRISMA_SCHEMA_ENGINE_BINARY = lib.getExe' prisma-engines_6 "schema-engine";
+    TURBO_NO_UPDATE_NOTIFIER = "true";
+    TURBO_FORCE = "true";
+    TURBO_REMOTE_CACHE_ENABLED = "false";
+  };
 
   buildPhase = ''
     runHook preBuild
@@ -78,17 +76,17 @@ buildNpmPackage {
           mkdir -p $out/bin
           cp -r . $out/
 
-          cat > $out/bin/${pname} <<EOF
+          cat > $out/bin/documenso <<EOF
     #!${bash}/bin/bash
-    export PKG_CONFIG_PATH=${openssl.dev}/lib/pkgconfig;
-    export PRISMA_QUERY_ENGINE_LIBRARY=${prisma-engines_6}/lib/libquery_engine.node
-    export PRISMA_QUERY_ENGINE_BINARY=${prisma-engines_6}/bin/query-engine
+    export PKG_CONFIG_PATH=${lib.getLib openssl.dev}/lib/pkgconfig;
+    export PRISMA_QUERY_ENGINE_LIBRARY=${lib.getLib prisma-engines_6}/lib/libquery_engine.node
+    export PRISMA_QUERY_ENGINE_BINARY=${lib.getExe' prisma-engines_6 "query-engine"}
     export PRISMA_SCHEMA_ENGINE_BINARY=${prisma-engines_6}
     cd $out/apps/remix
-    ${prisma_6}/bin/prisma migrate deploy --schema ../../packages/prisma/schema.prisma
-    ${nodejs}/bin/node build/server/main.js
+    ${lib.getExe prisma_6} migrate deploy --schema ../../packages/prisma/schema.prisma
+    ${lib.getExe nodejs} build/server/main.js
     EOF
-          chmod +x $out/bin/${pname}
+          chmod +x $out/bin/documenso
 
           runHook postInstall
   '';
@@ -121,6 +119,6 @@ buildNpmPackage {
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ happysalada ];
     platforms = lib.platforms.unix;
-    mainProgram = pname;
+    mainProgram = "documenso";
   };
-}
+})
diff --git a/pkgs/by-name/du/dump_syms/package.nix b/pkgs/by-name/du/dump_syms/package.nix
index c43cd6a9a7dd..92e047b1b431 100644
--- a/pkgs/by-name/du/dump_syms/package.nix
+++ b/pkgs/by-name/du/dump_syms/package.nix
@@ -12,17 +12,14 @@
   thunderbird-unwrapped,
 }:
 
-let
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dump_syms";
   version = "2.3.6";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "dump_syms";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-ABfjLV6WMIiaSiyfR/uxL6+VyO/pO6oZjbJSAxRGXuE=";
   };
 
@@ -50,11 +47,11 @@ rustPlatform.buildRustPackage {
   __structuredAttrs = true;
 
   meta = {
-    changelog = "https://github.com/mozilla/dump_syms/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/mozilla/dump_syms/blob/v${finalAttrs.version}/CHANGELOG.md";
     description = "Command-line utility for parsing the debugging information the compiler provides in ELF or stand-alone PDB files";
     mainProgram = "dump_syms";
     license = lib.licenses.asl20;
     homepage = "https://github.com/mozilla/dump_syms/";
     maintainers = with lib.maintainers; [ hexa ];
   };
-}
+})
diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix
index b40784340e05..e8a3c4ac3744 100644
--- a/pkgs/by-name/e1/e1s/package.nix
+++ b/pkgs/by-name/e1/e1s/package.nix
@@ -3,17 +3,14 @@
   buildGoModule,
   fetchFromGitHub,
 }:
-let
+buildGoModule (finalAttrs: {
   pname = "e1s";
   version = "1.0.53";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "keidarcy";
     repo = "e1s";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Cy/aZVO6xM1oCeyT6x1O+otbUZ5lS90fl3iZzkf02QM=";
   };
 
@@ -22,7 +19,7 @@ buildGoModule {
   meta = {
     description = "Easily Manage AWS ECS Resources in Terminal";
     homepage = "https://github.com/keidarcy/e1s";
-    changelog = "https://github.com/keidarcy/e1s/releases/tag/v${version}";
+    changelog = "https://github.com/keidarcy/e1s/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     mainProgram = "e1s";
     maintainers = with lib.maintainers; [
@@ -30,4 +27,4 @@ buildGoModule {
       carlossless
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ec/ecdsautils/package.nix b/pkgs/by-name/ec/ecdsautils/package.nix
index e3d6138ada15..58c1056bcf59 100644
--- a/pkgs/by-name/ec/ecdsautils/package.nix
+++ b/pkgs/by-name/ec/ecdsautils/package.nix
@@ -9,17 +9,14 @@
   libuecc,
 }:
 
-let
+stdenv.mkDerivation (finalAttrs: {
   pname = "ecdsautils";
   version = "0.4.2";
-in
-stdenv.mkDerivation {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "freifunk-gluon";
     repo = "ecdsautils";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-vGHLAX/XOtePvdT/rljCOdlILHVO20mCt6p+MUi13dg=";
   };
 
@@ -47,4 +44,4 @@ stdenv.mkDerivation {
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/el/elvish/package.nix b/pkgs/by-name/el/elvish/package.nix
index b11d5e429c57..7b6afc81e4e1 100644
--- a/pkgs/by-name/el/elvish/package.nix
+++ b/pkgs/by-name/el/elvish/package.nix
@@ -5,17 +5,14 @@
   callPackage,
 }:
 
-let
+buildGoModule (finalAttrs: {
   pname = "elvish";
   version = "0.21.0";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "elves";
     repo = "elvish";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-+qkr0ziHWs3MVhBoqAxrwwbsQVvmGHRKrlqiujqBKvs=";
   };
 
@@ -26,7 +23,7 @@ buildGoModule {
   ldflags = [
     "-s"
     "-w"
-    "-X src.elv.sh/pkg/buildinfo.Version==${version}"
+    "-X src.elv.sh/pkg/buildinfo.Version==${finalAttrs.version}"
   ];
 
   strictDeps = true;
@@ -52,4 +49,4 @@ buildGoModule {
     license = lib.licenses.bsd2;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/er/erigon/package.nix b/pkgs/by-name/er/erigon/package.nix
index 1fa71cb0d581..36ad69665e2a 100644
--- a/pkgs/by-name/er/erigon/package.nix
+++ b/pkgs/by-name/er/erigon/package.nix
@@ -6,17 +6,14 @@
   versionCheckHook,
 }:
 
-let
+buildGoModule (finalAttrs: {
   pname = "erigon";
   version = "3.3.7";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "erigontech";
     repo = "erigon";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-pvwZ71/68jrRqTIPQdmlhJ/BLFhsNjmtcVfiqIC274c=";
     fetchSubmodules = true;
   };
@@ -66,4 +63,4 @@ buildGoModule {
       pmw
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix
index b16a8b26e5b6..2d3edf79a28a 100644
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@@ -6,18 +6,15 @@
   python3Packages,
 }:
 
-let
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "gallery-dl";
   version = "1.31.5";
-in
-python3Packages.buildPythonApplication {
-  inherit pname version;
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mikf";
     repo = "gallery-dl";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-jrTLiZs3LJaFZL40vxWS/1J9HHke9gmV9840AOUtLCU=";
   };
 
@@ -50,7 +47,7 @@ python3Packages.buildPythonApplication {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    changelog = "https://github.com/mikf/gallery-dl/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/mikf/gallery-dl/blob/v${finalAttrs.version}/CHANGELOG.md";
     description = "Command-line program to download image-galleries and -collections from several image hosting sites";
     homepage = "https://github.com/mikf/gallery-dl";
     license = lib.licenses.gpl2Only;
@@ -61,4 +58,4 @@ python3Packages.buildPythonApplication {
       lucasew
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix
index cae6cff91584..a25d3a54deb7 100644
--- a/pkgs/by-name/ga/gate/package.nix
+++ b/pkgs/by-name/ga/gate/package.nix
@@ -4,17 +4,14 @@
   fetchFromGitHub,
 }:
 
-let
+buildGoModule (finalAttrs: {
   pname = "gate";
   version = "0.62.3";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "minekube";
     repo = "gate";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-tOyXVqmexAWpC2s86aUUjmDp6V+qvP3ve8FrqdtexvU=";
   };
 
@@ -44,4 +41,4 @@ buildGoModule {
     maintainers = with lib.maintainers; [ XBagon ];
     mainProgram = "gate";
   };
-}
+})
diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix
index 640cd2d8b822..b63abd7f7981 100644
--- a/pkgs/by-name/gi/git-upstream/package.nix
+++ b/pkgs/by-name/gi/git-upstream/package.nix
@@ -4,17 +4,15 @@
   rustPlatform,
   nix-update-script,
 }:
-let
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "git-upstream";
   version = "1.6.0";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "9999years";
     repo = "git-upstream";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-rdxpo1OZD/fpBm76zD7U/YeZOBpliKXJN87LJkw6A28=";
   };
 
@@ -22,7 +20,7 @@ rustPlatform.buildRustPackage {
 
   meta = {
     homepage = "https://github.com/9999years/git-upstream";
-    changelog = "https://github.com/9999years/git-upstream/releases/tag/v${version}";
+    changelog = "https://github.com/9999years/git-upstream/releases/tag/v${finalAttrs.version}";
     description = "Shortcut for `git push --set-upstream`";
     license = [ lib.licenses.mit ];
     maintainers = [ lib.maintainers._9999years ];
@@ -30,4 +28,4 @@ rustPlatform.buildRustPackage {
   };
 
   passthru.updateScript = nix-update-script { };
-}
+})
diff --git a/pkgs/by-name/gi/gitopper/package.nix b/pkgs/by-name/gi/gitopper/package.nix
index e1b5d8b9674f..37968a86892a 100644
--- a/pkgs/by-name/gi/gitopper/package.nix
+++ b/pkgs/by-name/gi/gitopper/package.nix
@@ -5,21 +5,19 @@
   git,
   makeWrapper,
 }:
-let
+
+buildGoModule (finalAttrs: {
   pname = "gitopper";
   version = "0.0.20";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "miekg";
     repo = "gitopper";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-y0gzoXSIQDQ6TMVsAijPaN0sRqFEtTKyd297YxXAukM=";
   };
 
-  ldflags = [ "-X main.Version=${version}" ];
+  ldflags = [ "-X main.Version=${finalAttrs.version}" ];
 
   vendorHash = "sha256-b9lLOGk0h0kaWuZb142V8ojfpstRhzC9q2kSu0q7r7I=";
 
@@ -51,4 +49,4 @@ buildGoModule {
     maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
     mainProgram = "gitopper";
   };
-}
+})
diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix
index 63822fc7900a..d6bfa9c58b84 100644
--- a/pkgs/by-name/gi/gitui/package.nix
+++ b/pkgs/by-name/gi/gitui/package.nix
@@ -11,17 +11,15 @@
   nix-update-script,
   fetchpatch,
 }:
-let
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitui";
   version = "0.28.0";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "extrawurst";
     repo = "gitui";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-B3Cdhhu8ECfpc57TKe6u08Q/Kl4JzUlzw4vtJJ1YAUQ=";
   };
 
@@ -52,7 +50,7 @@ rustPlatform.buildRustPackage {
   '';
 
   env = {
-    GITUI_BUILD_NAME = version;
+    GITUI_BUILD_NAME = finalAttrs.version;
     # Needed to get openssl-sys to use pkg-config.
     OPENSSL_NO_VENDOR = 1;
   };
@@ -65,7 +63,7 @@ rustPlatform.buildRustPackage {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    changelog = "https://github.com/extrawurst/gitui/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/extrawurst/gitui/blob/v${finalAttrs.version}/CHANGELOG.md";
     description = "Blazing fast terminal-ui for Git written in Rust";
     homepage = "https://github.com/extrawurst/gitui";
     license = lib.licenses.mit;
@@ -75,4 +73,4 @@ rustPlatform.buildRustPackage {
       mfrw
     ];
   };
-}
+})
diff --git a/pkgs/by-name/gl/gluesql/package.nix b/pkgs/by-name/gl/gluesql/package.nix
index f37eaad0a778..0a501b461d94 100644
--- a/pkgs/by-name/gl/gluesql/package.nix
+++ b/pkgs/by-name/gl/gluesql/package.nix
@@ -5,17 +5,14 @@
   nix-update-script,
 }:
 
-let
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gluesql";
   version = "0.14.0";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "gluesql";
     repo = "gluesql";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-z2fpyPJfyPtO13Ly7XRmMW3rp6G3jNLsMMFz83Wmr0E=";
   };
 
@@ -30,4 +27,4 @@ rustPlatform.buildRustPackage {
     maintainers = with lib.maintainers; [ happysalada ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/gp/gptcommit/package.nix b/pkgs/by-name/gp/gptcommit/package.nix
index 3ecea36e2a37..9a923674f43b 100644
--- a/pkgs/by-name/gp/gptcommit/package.nix
+++ b/pkgs/by-name/gp/gptcommit/package.nix
@@ -8,17 +8,14 @@
   openssl,
 }:
 
-let
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gptcommit";
   version = "0.5.17";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "zurawiki";
     repo = "gptcommit";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-MB78QsJA90Au0bCUXfkcjnvfPagTPZwFhFVqxix+Clw=";
   };
 
@@ -43,4 +40,4 @@ rustPlatform.buildRustPackage {
     maintainers = with lib.maintainers; [ happysalada ];
     platforms = with lib.platforms; all;
   };
-}
+})
diff --git a/pkgs/by-name/gr/grip-grab/package.nix b/pkgs/by-name/gr/grip-grab/package.nix
index 4d8d234ef980..24ca29a163df 100644
--- a/pkgs/by-name/gr/grip-grab/package.nix
+++ b/pkgs/by-name/gr/grip-grab/package.nix
@@ -3,17 +3,15 @@
   rustPlatform,
   fetchFromGitHub,
 }:
-let
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "grip-grab";
   version = "0.6.7";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "alexpasmantier";
     repo = "grip-grab";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-e7duLL4tjW+11jXUqU6sqoKTAPGkH81iDCfjtNcnd4I=";
   };
 
@@ -29,4 +27,4 @@ rustPlatform.buildRustPackage {
     maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
     mainProgram = "gg";
   };
-}
+})
diff --git a/pkgs/by-name/jw/jwtinfo/package.nix b/pkgs/by-name/jw/jwtinfo/package.nix
index 6935da97ddc5..f21b4b6f6331 100644
--- a/pkgs/by-name/jw/jwtinfo/package.nix
+++ b/pkgs/by-name/jw/jwtinfo/package.nix
@@ -3,17 +3,15 @@
   rustPlatform,
   fetchFromGitHub,
 }:
-let
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jwtinfo";
   version = "0.6.1";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "lmammino";
     repo = "jwtinfo";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-o2SbPTnYSqsjpTl1Z8uSZZLeHx4lxunwDdig4UuVFKg=";
   };
 
@@ -22,9 +20,9 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Command-line tool to get information about JWTs";
     homepage = "https://github.com/lmammino/jwtinfo";
-    changelog = "https://github.com/lmammino/jwtinfo/releases/tag/v${version}";
+    changelog = "https://github.com/lmammino/jwtinfo/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
     mainProgram = "jwtinfo";
   };
-}
+})
diff --git a/pkgs/by-name/kr/kratos/package.nix b/pkgs/by-name/kr/kratos/package.nix
index c4c5f3f19456..12b444b5c5f5 100644
--- a/pkgs/by-name/kr/kratos/package.nix
+++ b/pkgs/by-name/kr/kratos/package.nix
@@ -4,17 +4,15 @@
   lib,
   stdenv,
 }:
-let
+
+buildGoModule (finalAttrs: {
   pname = "kratos";
   version = "25.4.0";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "ory";
     repo = "kratos";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-f/K86B5h7xM7Zsbr5w2rZgsyNlCSemrBkqtMRQq/Xws=";
   };
 
@@ -26,7 +24,7 @@ buildGoModule {
 
   # Pass versioning information via ldflags
   ldflags = [
-    "-X github.com/ory/kratos/driver/config.Version=${version}"
+    "-X github.com/ory/kratos/driver/config.Version=${finalAttrs.version}"
   ];
 
   doCheck = false;
@@ -52,4 +50,4 @@ buildGoModule {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ mrmebelman ];
   };
-}
+})
diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix
index e8cfa15f7063..99d56cc451d5 100644
--- a/pkgs/by-name/le/lefthook/package.nix
+++ b/pkgs/by-name/le/lefthook/package.nix
@@ -6,17 +6,14 @@
   installShellFiles,
 }:
 
-let
+buildGoModule (finalAttrs: {
   pname = "lefthook";
   version = "2.1.0";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "evilmartians";
     repo = "lefthook";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-C4DAgM/E3yu6vZU7OSE250FLmblpNvJBu1eqQUHL1eI=";
   };
 
@@ -41,9 +38,9 @@ buildGoModule {
   meta = {
     description = "Fast and powerful Git hooks manager for any type of projects";
     homepage = "https://github.com/evilmartians/lefthook";
-    changelog = "https://github.com/evilmartians/lefthook/raw/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/evilmartians/lefthook/raw/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     mainProgram = "lefthook";
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/le/leiningen/package.nix b/pkgs/by-name/le/leiningen/package.nix
index 5390bc2483c0..a25997dd8283 100644
--- a/pkgs/by-name/le/leiningen/package.nix
+++ b/pkgs/by-name/le/leiningen/package.nix
@@ -8,24 +8,21 @@
   rlwrap,
   gnupg,
 }:
-let
+stdenv.mkDerivation (finalAttrs: {
   pname = "leiningen";
   version = "2.12.0";
-in
-stdenv.mkDerivation {
-  inherit pname version;
 
   src = fetchurl {
-    url = "https://codeberg.org/leiningen/leiningen/raw/tag/${version}/bin/lein-pkg";
+    url = "https://codeberg.org/leiningen/leiningen/raw/tag/${finalAttrs.version}/bin/lein-pkg";
     hash = "sha256-EqnF46JHFhnKPWSnRi+SD99xOuiVnrT81iV8IzMrWqQ=";
   };
 
   jarsrc = fetchurl {
-    url = "https://codeberg.org/leiningen/leiningen/releases/download/${version}/leiningen-${version}-standalone.jar";
+    url = "https://codeberg.org/leiningen/leiningen/releases/download/${finalAttrs.version}/leiningen-${finalAttrs.version}-standalone.jar";
     hash = "sha256-tyGlc69jF4TyfMtS5xnm0Sh9nTlRrVbTFtOPfs+oGqI=";
   };
 
-  JARNAME = "${pname}-${version}-standalone.jar";
+  JARNAME = "leiningen-${finalAttrs.version}-standalone.jar";
 
   dontUnpack = true;
 
@@ -74,4 +71,4 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [ momeemt ];
     mainProgram = "lein";
   };
-}
+})
diff --git a/pkgs/by-name/li/lite-xl/package.nix b/pkgs/by-name/li/lite-xl/package.nix
index 50b639093b53..0b33de1c3843 100644
--- a/pkgs/by-name/li/lite-xl/package.nix
+++ b/pkgs/by-name/li/lite-xl/package.nix
@@ -11,17 +11,15 @@
   sdl3,
   stdenv,
 }:
-let
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "lite-xl";
   version = "2.1.8";
-in
-stdenv.mkDerivation {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "lite-xl";
     repo = "lite-xl";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-9JpD7f5vOGhLW8dBjjYUI5PSaz/XWW5sIOZCAbKhxtE=";
   };
 
@@ -60,4 +58,4 @@ stdenv.mkDerivation {
     platforms = lib.platforms.unix;
     mainProgram = "lite-xl";
   };
-}
+})
diff --git a/pkgs/by-name/md/mdbook-yml-header/package.nix b/pkgs/by-name/md/mdbook-yml-header/package.nix
index f19a6c00e9ae..02147f384b66 100644
--- a/pkgs/by-name/md/mdbook-yml-header/package.nix
+++ b/pkgs/by-name/md/mdbook-yml-header/package.nix
@@ -5,15 +5,12 @@
   nix-update-script,
 }:
 
-let
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdbook-yml-header";
   version = "0.1.5";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-QlclxqH6cKo9QZyUBFCcujT9liTc8lmEheyjFKK7N58=";
   };
 
@@ -29,4 +26,4 @@ rustPlatform.buildRustPackage {
     mainProgram = "mdbook-yml-header";
     maintainers = [ lib.maintainers.pinage404 ];
   };
-}
+})
diff --git a/pkgs/by-name/md/mdsf/package.nix b/pkgs/by-name/md/mdsf/package.nix
index b4b0ba1a4586..6f845f536d2a 100644
--- a/pkgs/by-name/md/mdsf/package.nix
+++ b/pkgs/by-name/md/mdsf/package.nix
@@ -7,17 +7,15 @@
   nix-update-script,
   installShellFiles,
 }:
-let
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdsf";
   version = "0.11.1";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "hougesen";
     repo = "mdsf";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-UfLgrukVYqkUKBI7CNLIkANO1md6ArrbSIh+f0F3bek=";
   };
 
@@ -49,4 +47,4 @@ rustPlatform.buildRustPackage {
     maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
     mainProgram = "mdsf";
   };
-}
+})
diff --git a/pkgs/by-name/mi/minidlna/package.nix b/pkgs/by-name/mi/minidlna/package.nix
index 63a6a356d9a3..8f3d82e808e8 100644
--- a/pkgs/by-name/mi/minidlna/package.nix
+++ b/pkgs/by-name/mi/minidlna/package.nix
@@ -17,16 +17,13 @@
   zlib,
 }:
 
-let
+stdenv.mkDerivation (finalAttrs: {
   pname = "minidlna";
   version = "1.3.3";
-in
-stdenv.mkDerivation {
-  inherit pname version;
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/minidlna/git";
-    rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}";
+    rev = "v${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
     hash = "sha256-InsSguoGi1Gp8R/bd4/c16xqRuk0bRsgw7wvcbokgKo=";
   };
 
@@ -75,4 +72,4 @@ stdenv.mkDerivation {
     platforms = lib.platforms.linux;
     mainProgram = "minidlnad";
   };
-}
+})
diff --git a/pkgs/by-name/mo/modprobed-db/package.nix b/pkgs/by-name/mo/modprobed-db/package.nix
index 12a799ff276b..f3252ccde446 100644
--- a/pkgs/by-name/mo/modprobed-db/package.nix
+++ b/pkgs/by-name/mo/modprobed-db/package.nix
@@ -8,17 +8,15 @@
   bash,
   installShellFiles,
 }:
-let
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "modprobed-db";
   version = "2.48";
-in
-stdenv.mkDerivation {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = "modprobed-db";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-rMkPBRg0QluMmSCAWSvET7rS/A2aUL6H31KKoZ6NTEs=";
   };
 
@@ -55,4 +53,4 @@ stdenv.mkDerivation {
     mainProgram = "modprobed-db";
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix
index 4839d8af5071..6c7167681675 100644
--- a/pkgs/by-name/mo/mov-cli/package.nix
+++ b/pkgs/by-name/mo/mov-cli/package.nix
@@ -7,18 +7,15 @@
   python3,
 }:
 
-let
+python3.pkgs.buildPythonPackage (finalAttrs: {
   pname = "mov-cli";
   version = "4.4.19";
-in
-python3.pkgs.buildPythonPackage {
-  inherit pname version;
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mov-cli";
     repo = "mov-cli";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-sNeScHmQYR4Avr5OEFpE90Qn7udBgi1Ox5elFSyKXrY=";
   };
 
@@ -68,4 +65,4 @@ python3.pkgs.buildPythonPackage {
     mainProgram = "mov-cli";
     maintainers = with lib.maintainers; [ baitinq ];
   };
-}
+})
diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix
index b8f771f73eb1..65e946da47fb 100644
--- a/pkgs/by-name/ne/netscanner/package.nix
+++ b/pkgs/by-name/ne/netscanner/package.nix
@@ -5,19 +5,17 @@
   makeWrapper,
   iw,
 }:
-let
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "netscanner";
   version = "0.6.41";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   nativeBuildInputs = [ makeWrapper ];
 
   src = fetchFromGitHub {
     owner = "Chleba";
     repo = "netscanner";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-8Srsts0FDLMT01YW5Guv3r8yx5i5ua7bhAFbQ5BMN74=";
   };
 
@@ -31,9 +29,9 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Network scanner with features like WiFi scanning, packetdump and more";
     homepage = "https://github.com/Chleba/netscanner";
-    changelog = "https://github.com/Chleba/netscanner/releases/tag/v${version}";
+    changelog = "https://github.com/Chleba/netscanner/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ NotAShelf ];
     mainProgram = "netscanner";
   };
-}
+})
diff --git a/pkgs/by-name/ni/nix-bisect/package.nix b/pkgs/by-name/ni/nix-bisect/package.nix
index d05997d30c46..2276d34b59e0 100644
--- a/pkgs/by-name/ni/nix-bisect/package.nix
+++ b/pkgs/by-name/ni/nix-bisect/package.nix
@@ -4,12 +4,9 @@
   python3,
 }:
 
-let
+python3.pkgs.buildPythonApplication {
   pname = "nix-bisect";
   version = "0.4.1-unstable-2024-04-19";
-in
-python3.pkgs.buildPythonApplication {
-  inherit pname version;
   pyproject = true;
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/oc/ockam/package.nix b/pkgs/by-name/oc/ockam/package.nix
index eac7a250ae11..1c292b27a7bb 100644
--- a/pkgs/by-name/oc/ockam/package.nix
+++ b/pkgs/by-name/oc/ockam/package.nix
@@ -9,17 +9,14 @@
   dbus,
 }:
 
-let
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ockam";
   version = "0.157.0";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "build-trust";
     repo = "ockam";
-    rev = "ockam_v${version}";
+    rev = "ockam_v${finalAttrs.version}";
     hash = "sha256-o895VPlUGmLUsIeOnShjCetKoS/4x0nbEKxipEbuBu4=";
   };
 
@@ -46,4 +43,4 @@ rustPlatform.buildRustPackage {
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ happysalada ];
   };
-}
+})
diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix
index 9658e18c4b52..7d0ac5c58638 100644
--- a/pkgs/by-name/op/openfga-cli/package.nix
+++ b/pkgs/by-name/op/openfga-cli/package.nix
@@ -5,18 +5,14 @@
   installShellFiles,
 }:
 
-let
+buildGoModule (finalAttrs: {
   pname = "openfga-cli";
   version = "0.7.8";
-in
-
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "cli";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-AZq/BrAgm9mQGnfq9qxZTsv/yMnOH59u3G7sN8vdFDQ=";
   };
 
@@ -31,8 +27,8 @@ buildGoModule {
     [
       "-s"
       "-w"
-      "-X ${buildInfoPkg}.Version=${version}"
-      "-X ${buildInfoPkg}.Commit=${version}"
+      "-X ${buildInfoPkg}.Version=${finalAttrs.version}"
+      "-X ${buildInfoPkg}.Commit=${finalAttrs.version}"
       "-X ${buildInfoPkg}.Date=19700101"
     ];
 
@@ -52,4 +48,4 @@ buildGoModule {
     mainProgram = "fga";
     maintainers = with lib.maintainers; [ jlesquembre ];
   };
-}
+})
diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix
index 3162dbefdef4..786b16d322f0 100644
--- a/pkgs/by-name/op/openfga/package.nix
+++ b/pkgs/by-name/op/openfga/package.nix
@@ -5,18 +5,14 @@
   installShellFiles,
 }:
 
-let
+buildGoModule (finalAttrs: {
   pname = "openfga";
   version = "1.11.3";
-in
-
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "openfga";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-PpDyDwKYx45Q07n7AdwVQdZ2TygDYo/Zi6m+RnzGPzE=";
   };
 
@@ -31,8 +27,8 @@ buildGoModule {
     [
       "-s"
       "-w"
-      "-X ${buildInfoPkg}.Version=${version}"
-      "-X ${buildInfoPkg}.Commit=${version}"
+      "-X ${buildInfoPkg}.Version=${finalAttrs.version}"
+      "-X ${buildInfoPkg}.Commit=${finalAttrs.version}"
       "-X ${buildInfoPkg}.Date=19700101"
     ];
 
@@ -55,4 +51,4 @@ buildGoModule {
     mainProgram = "openfga";
     maintainers = with lib.maintainers; [ jlesquembre ];
   };
-}
+})
diff --git a/pkgs/by-name/op/opengfw/package.nix b/pkgs/by-name/op/opengfw/package.nix
index 2281181c077f..c27eb1ab6b38 100644
--- a/pkgs/by-name/op/opengfw/package.nix
+++ b/pkgs/by-name/op/opengfw/package.nix
@@ -3,22 +3,22 @@
   buildGoModule,
   fetchFromGitHub,
 }:
-let
+
+buildGoModule (finalAttrs: {
   pname = "opengfw";
   version = "0.4.1";
-in
-buildGoModule {
-  inherit pname version;
-  env.CGO_ENABLED = 0;
-  vendorHash = "sha256-F8jTvgxOhOGVtl6B8u0xAIvjNwVjBtvAhApzjIgykpY=";
 
   src = fetchFromGitHub {
     owner = "apernet";
     repo = "opengfw";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-6PFfsPfLzzeaImcteX9u/k5pwe3cvSQwT90TCizA3gI=";
   };
 
+  vendorHash = "sha256-F8jTvgxOhOGVtl6B8u0xAIvjNwVjBtvAhApzjIgykpY=";
+
+  env.CGO_ENABLED = 0;
+
   meta = {
     mainProgram = "OpenGFW";
     description = "Flexible, easy-to-use, open source implementation of GFW on Linux";
@@ -34,4 +34,4 @@ buildGoModule {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ eum3l ];
   };
-}
+})
diff --git a/pkgs/by-name/pd/pdfannots2json/package.nix b/pkgs/by-name/pd/pdfannots2json/package.nix
index 8605de557418..fc9b17475943 100644
--- a/pkgs/by-name/pd/pdfannots2json/package.nix
+++ b/pkgs/by-name/pd/pdfannots2json/package.nix
@@ -4,17 +4,14 @@
   fetchFromGitHub,
 }:
 
-let
+buildGoModule (finalAttrs: {
   pname = "pdfannots2json";
   version = "1.0.16";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "mgmeyers";
     repo = "pdfannots2json";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-qk4OSws/6SevN/Q0lsyxw+fZkm2uy1WwOYYL7CB7QUk=";
   };
 
@@ -27,4 +24,4 @@ buildGoModule {
     mainProgram = "pdfannots2json";
     maintainers = with lib.maintainers; [ _0nyr ];
   };
-}
+})
diff --git a/pkgs/by-name/pl/plakativ/package.nix b/pkgs/by-name/pl/plakativ/package.nix
index d7b14371f5fe..8c93bda568e0 100644
--- a/pkgs/by-name/pl/plakativ/package.nix
+++ b/pkgs/by-name/pl/plakativ/package.nix
@@ -4,16 +4,14 @@
   fetchPypi,
   guiSupport ? true,
 }:
-let
+
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "plakativ";
   version = "0.5.3";
-in
-python3Packages.buildPythonApplication {
   pyproject = true;
-  inherit pname version;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-6TvMznd5obkn/gsQTyZ6Pc/dF55I53987EbuSNAlY58=";
   };
 
@@ -36,4 +34,4 @@ python3Packages.buildPythonApplication {
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ marcin-serwin ];
   };
-}
+})
diff --git a/pkgs/by-name/po/poptop/package.nix b/pkgs/by-name/po/poptop/package.nix
index 8796c2b16272..d9723b52fd7b 100644
--- a/pkgs/by-name/po/poptop/package.nix
+++ b/pkgs/by-name/po/poptop/package.nix
@@ -3,17 +3,15 @@
   buildGoModule,
   fetchFromGitHub,
 }:
-let
+
+buildGoModule (finalAttrs: {
   pname = "poptop";
   version = "0.1.8";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "bakks";
     repo = "poptop";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-CwJpkGNTDmtXfJx6GGz2XRU0fMeKl7I3fXm4BJ9MAQ4=";
   };
 
@@ -21,10 +19,10 @@ buildGoModule {
 
   meta = {
     description = "Modern top command that charts system metrics like CPU load, network IO, etc in the terminal";
-    changelog = "https://github.com/bakks/poptop/releases/tag/v${version}";
+    changelog = "https://github.com/bakks/poptop/releases/tag/v${finalAttrs.version}";
     homepage = "https://github.com/bakks/poptop";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
     mainProgram = "poptop";
   };
-}
+})
diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix
index d3f816729ae0..63b53894e3ba 100644
--- a/pkgs/by-name/qs/qsv/package.nix
+++ b/pkgs/by-name/qs/qsv/package.nix
@@ -31,17 +31,16 @@
   mainProgram ? "qsv",
 }:
 
-let
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "qsv";
   version = "14.0.0";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version buildFeatures;
+
+  inherit buildFeatures;
 
   src = fetchFromGitHub {
     owner = "dathere";
     repo = "qsv";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-Y/rCNG74R9EZMp+vLdGr+62HRM5Y4LpXq2C9S7gZ3fM=";
   };
 
@@ -70,7 +69,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "CSVs sliced, diced & analyzed";
     homepage = "https://github.com/dathere/qsv";
-    changelog = "https://github.com/dathere/qsv/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/dathere/qsv/blob/${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       mit
       # or
@@ -82,4 +81,4 @@ rustPlatform.buildRustPackage {
       misuzu
     ];
   };
-}
+})
diff --git a/pkgs/by-name/qu/quivira/package.nix b/pkgs/by-name/qu/quivira/package.nix
index b90e4fc6e068..d00ba2b3424e 100644
--- a/pkgs/by-name/qu/quivira/package.nix
+++ b/pkgs/by-name/qu/quivira/package.nix
@@ -1,10 +1,8 @@
 { lib, fetchurl }:
-let
+fetchurl {
   pname = "quivira";
   version = "4.1";
-in
-fetchurl {
-  inherit pname version;
+
   url = "http://www.quivira-font.com/files/Quivira.otf";
 
   # Download the source file to a temporary directory so that $out can be a
diff --git a/pkgs/by-name/re/redfishtool/package.nix b/pkgs/by-name/re/redfishtool/package.nix
index 029617a616a9..1f1874c4f81c 100644
--- a/pkgs/by-name/re/redfishtool/package.nix
+++ b/pkgs/by-name/re/redfishtool/package.nix
@@ -4,16 +4,13 @@
   python3,
 }:
 
-let
+python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "redfishtool";
   version = "1.1.8";
-in
-python3.pkgs.buildPythonApplication {
-  inherit pname version;
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-X/G6osOHCBidKZG/Y2nmHadifDacJhjBIc7WYrUCPn8=";
   };
 
@@ -29,9 +26,9 @@ python3.pkgs.buildPythonApplication {
   meta = {
     description = "Python34 program that implements a command line tool for accessing the Redfish API";
     homepage = "https://github.com/DMTF/Redfishtool";
-    changelog = "https://github.com/DMTF/Redfishtool/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/DMTF/Redfishtool/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ jfvillablanca ];
     mainProgram = "redfishtool";
   };
-}
+})
diff --git a/pkgs/by-name/re/regrippy/package.nix b/pkgs/by-name/re/regrippy/package.nix
index dcb932a1a39f..8955c058a973 100644
--- a/pkgs/by-name/re/regrippy/package.nix
+++ b/pkgs/by-name/re/regrippy/package.nix
@@ -4,16 +4,13 @@
   fetchPypi,
 }:
 
-let
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "regrippy";
   version = "2.0.2";
-in
-python3Packages.buildPythonApplication {
-  inherit pname version;
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-43Wh5iQE1ihD8aGxDmmwKDkPeMfySP0mdk0XhrVefyc=";
   };
 
@@ -35,4 +32,4 @@ python3Packages.buildPythonApplication {
     maintainers = with lib.maintainers; [ mikehorn ];
     mainProgram = "regrippy";
   };
-}
+})
diff --git a/pkgs/by-name/ru/rustlings/package.nix b/pkgs/by-name/ru/rustlings/package.nix
index c2d818cfe705..cc8ad4924c54 100644
--- a/pkgs/by-name/ru/rustlings/package.nix
+++ b/pkgs/by-name/ru/rustlings/package.nix
@@ -9,16 +9,15 @@
   gcc,
   makeWrapper,
 }:
-let
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustlings";
   version = "6.5.0";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
+
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rustlings";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-dUQIzNPxmKbhew9VjFIW7bY0D1IkuJ5+hRY2/CwmYhY=";
   };
 
@@ -55,4 +54,4 @@ rustPlatform.buildRustPackage {
     maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
     mainProgram = "rustlings";
   };
-}
+})
diff --git a/pkgs/by-name/ru/rustus/package.nix b/pkgs/by-name/ru/rustus/package.nix
index ae922f1c300d..b9af89403dd9 100644
--- a/pkgs/by-name/ru/rustus/package.nix
+++ b/pkgs/by-name/ru/rustus/package.nix
@@ -8,17 +8,14 @@
   rdkafka,
 }:
 
-let
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustus";
   version = "1.1.3";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "s3rius";
     repo = "rustus";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-ALnb6ICg+TZRuHayhozwJ5+imabgjBYX4W42ydhkzv0=";
   };
 
@@ -67,4 +64,4 @@ rustPlatform.buildRustPackage {
     maintainers = with lib.maintainers; [ happysalada ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/sa/saucectl/package.nix b/pkgs/by-name/sa/saucectl/package.nix
index eea8b9c64ba8..14e734e39317 100644
--- a/pkgs/by-name/sa/saucectl/package.nix
+++ b/pkgs/by-name/sa/saucectl/package.nix
@@ -3,23 +3,21 @@
   buildGoModule,
   fetchFromGitHub,
 }:
-let
+
+buildGoModule (finalAttrs: {
   pname = "saucectl";
   version = "0.198.0";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "saucelabs";
     repo = "saucectl";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-l9iiMyL1OgjmWj2qbzQAobi+DFoecueaRP2SV6KGbn4=";
   };
 
   ldflags = [
-    "-X github.com/saucelabs/saucectl/internal/version.Version=${version}"
-    "-X github.com/saucelabs/saucectl/internal/version.GitCommit=${version}"
+    "-X github.com/saucelabs/saucectl/internal/version.Version=${finalAttrs.version}"
+    "-X github.com/saucelabs/saucectl/internal/version.GitCommit=${finalAttrs.version}"
   ];
 
   vendorHash = "sha256-n/GblPFolUD+noxGI4yZbOGdAUxM0DXtpCybS+E0k3I=";
@@ -28,10 +26,10 @@ buildGoModule {
 
   meta = {
     description = "Command line interface for the Sauce Labs platform";
-    changelog = "https://github.com/saucelabs/saucectl/releases/tag/v${version}";
+    changelog = "https://github.com/saucelabs/saucectl/releases/tag/v${finalAttrs.version}";
     homepage = "https://github.com/saucelabs/saucectl";
     license = lib.licenses.apsl20;
     maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
     mainProgram = "saucectl";
   };
-}
+})
diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix
index 2f59b87f87f3..74a774a956e0 100644
--- a/pkgs/by-name/se/serpl/package.nix
+++ b/pkgs/by-name/se/serpl/package.nix
@@ -8,16 +8,15 @@
   ripgrep,
   versionCheckHook,
 }:
-let
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "serpl";
   version = "0.3.4";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
+
   src = fetchFromGitHub {
     owner = "yassinebridi";
     repo = "serpl";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-lEvUS1RlZ4CvervzyfODsFqRJAiA6PyLNUVWhSoPMDY=";
   };
 
@@ -53,4 +52,4 @@ rustPlatform.buildRustPackage {
     maintainers = with lib.maintainers; [ NotAShelf ];
     mainProgram = "serpl";
   };
-}
+})
diff --git a/pkgs/by-name/sp/spotlight-downloader/package.nix b/pkgs/by-name/sp/spotlight-downloader/package.nix
index 96e8d8b89b46..be633bc163a9 100644
--- a/pkgs/by-name/sp/spotlight-downloader/package.nix
+++ b/pkgs/by-name/sp/spotlight-downloader/package.nix
@@ -7,17 +7,14 @@
   makeWrapper,
 }:
 
-let
+stdenv.mkDerivation (finalAttrs: {
   pname = "spotlight-downloader";
   version = "1.5.0";
-in
-stdenv.mkDerivation {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "ORelio";
     repo = "Spotlight-Downloader";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-wGblbLBfH/sjUsz+hcg7OOWFavJ0k4piU/ypBEodvpY=";
   };
 
@@ -53,4 +50,4 @@ stdenv.mkDerivation {
     platforms = lib.platforms.unix;
     mainProgram = "SpotlightDownloader";
   };
-}
+})
diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix
index 33af631b3b43..a4e932c99f06 100644
--- a/pkgs/by-name/st/stylance-cli/package.nix
+++ b/pkgs/by-name/st/stylance-cli/package.nix
@@ -4,15 +4,13 @@
   fetchCrate,
   versionCheckHook,
 }:
-let
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stylance-cli";
   version = "0.7.4";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-lGgKmNqZ0nflVAM3GMDwGgxnXyLCqVz1bTUsvabXmj8=";
   };
 
@@ -26,8 +24,8 @@ rustPlatform.buildRustPackage {
     description = "Library and cli tool for working with scoped CSS in rust";
     mainProgram = "stylance";
     homepage = "https://github.com/basro/stylance-rs";
-    changelog = "https://github.com/basro/stylance-rs/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/basro/stylance-rs/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ dav-wolff ];
   };
-}
+})
diff --git a/pkgs/by-name/su/surrealdb-migrations/package.nix b/pkgs/by-name/su/surrealdb-migrations/package.nix
index 025b8b6c1ea3..b20012747b20 100644
--- a/pkgs/by-name/su/surrealdb-migrations/package.nix
+++ b/pkgs/by-name/su/surrealdb-migrations/package.nix
@@ -7,17 +7,14 @@
   nix-update-script,
 }:
 
-let
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "surrealdb-migrations";
   version = "2.4.0";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "Odonno";
     repo = "surrealdb-migrations";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-eeIXbpfXZ91XcQ+4T76BGZU0Ron5dAf2pUAvLj9nEok=";
   };
 
@@ -59,4 +56,4 @@ rustPlatform.buildRustPackage {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ happysalada ];
   };
-}
+})
diff --git a/pkgs/by-name/ta/talkfilters/package.nix b/pkgs/by-name/ta/talkfilters/package.nix
index a628e14f838c..669e65fe3647 100644
--- a/pkgs/by-name/ta/talkfilters/package.nix
+++ b/pkgs/by-name/ta/talkfilters/package.nix
@@ -4,16 +4,12 @@
   fetchurl,
 }:
 
-let
+stdenv.mkDerivation (finalAttrs: {
   pname = "talkfilters";
   version = "2.3.8";
-in
-
-stdenv.mkDerivation {
-  inherit pname version;
 
   src = fetchurl {
-    url = "http://www.hyperrealm.com/talkfilters/talkfilters-${version}.tar.gz";
+    url = "http://www.hyperrealm.com/talkfilters/talkfilters-${finalAttrs.version}.tar.gz";
     sha256 = "19nc5vq4bnkjvhk8srqddzhcs93jyvpm9r6lzjzwc1mgf08yg0a6";
   };
 
@@ -26,4 +22,4 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [ ikervagyok ];
     platforms = with lib.platforms; unix;
   };
-}
+})
diff --git a/pkgs/by-name/to/totp-cli/package.nix b/pkgs/by-name/to/totp-cli/package.nix
index 8d61ba65aae8..fe1ec8b4e445 100644
--- a/pkgs/by-name/to/totp-cli/package.nix
+++ b/pkgs/by-name/to/totp-cli/package.nix
@@ -4,17 +4,15 @@
   fetchFromGitHub,
   installShellFiles,
 }:
-let
+
+buildGoModule (finalAttrs: {
   pname = "totp-cli";
   version = "1.9.2";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "yitsushi";
     repo = "totp-cli";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-JPS4LXEgFM+RJhJG9w/SmEYmq6kILie139UrFGyZ2q0=";
   };
 
@@ -35,4 +33,4 @@ buildGoModule {
     maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
     mainProgram = "totp-cli";
   };
-}
+})
diff --git a/pkgs/by-name/tp/tparse/package.nix b/pkgs/by-name/tp/tparse/package.nix
index 2925a24cae93..25d613163884 100644
--- a/pkgs/by-name/tp/tparse/package.nix
+++ b/pkgs/by-name/tp/tparse/package.nix
@@ -3,17 +3,15 @@
   buildGoModule,
   fetchFromGitHub,
 }:
-let
+
+buildGoModule (finalAttrs: {
   pname = "tparse";
   version = "0.18.0";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "mfridman";
     repo = "tparse";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-oJApKmdo8uvnm6npXpzcKBRRkZ901AH1kZqGuoLdB3U=";
   };
 
@@ -22,7 +20,7 @@ buildGoModule {
   ldflags = [
     "-s"
     "-w"
-    "-X main.version=${version}"
+    "-X main.version=${finalAttrs.version}"
   ];
 
   meta = {
@@ -32,4 +30,4 @@ buildGoModule {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ obreitwi ];
   };
-}
+})
diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix
index d5cc9fd2c8cc..4b65c92f136e 100644
--- a/pkgs/by-name/ts/ts_query_ls/package.nix
+++ b/pkgs/by-name/ts/ts_query_ls/package.nix
@@ -4,17 +4,14 @@
   fetchFromGitHub,
   cmake,
 }:
-let
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ts_query_ls";
   version = "3.15.1";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "ribru17";
     repo = "ts_query_ls";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-m3jtaVYy/mNhM584asctI9ZUdaHvPr3ULRHYmmyKsLA=";
   };
 
@@ -25,9 +22,9 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "LSP implementation for Tree-sitter's query files";
     homepage = "https://github.com/ribru17/ts_query_ls";
-    changelog = "https://github.com/ribru17/ts_query_ls/releases/tag/v${version}";
+    changelog = "https://github.com/ribru17/ts_query_ls/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ribru17 ];
     mainProgram = "ts_query_ls";
   };
-}
+})
diff --git a/pkgs/by-name/vi/vim-startuptime/package.nix b/pkgs/by-name/vi/vim-startuptime/package.nix
index 7cd1cf1dcdf0..7cfd276de190 100644
--- a/pkgs/by-name/vi/vim-startuptime/package.nix
+++ b/pkgs/by-name/vi/vim-startuptime/package.nix
@@ -4,12 +4,11 @@
   buildGoModule,
   fetchFromGitHub,
 }:
-let
+
+buildGoModule (finalAttrs: {
   pname = "vim-startuptime";
   version = "1.3.2";
-in
-buildGoModule {
-  inherit pname version;
+
   ldflags = [
     "-s"
     "-w"
@@ -18,7 +17,7 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "rhysd";
     repo = "vim-startuptime";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-d6AXTWTUawkBCXCvMs3C937qoRUZmy0qCFdSLcWh0BE=";
   };
 
@@ -36,4 +35,4 @@ buildGoModule {
     license = lib.licenses.mit;
     mainProgram = "vim-startuptime";
   };
-}
+})
diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix
index 6b57d5f8b8b4..e3ef7311369b 100644
--- a/pkgs/by-name/wa/wait4x/package.nix
+++ b/pkgs/by-name/wa/wait4x/package.nix
@@ -3,17 +3,14 @@
   buildGoModule,
   fetchFromGitHub,
 }:
-let
+buildGoModule (finalAttrs: {
   pname = "wait4x";
   version = "3.6.0";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "wait4x";
     repo = "wait4x";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-RiF5tcnzMteXaYmw4mfQdamwV1PAyNC8pUownJzfACs=";
   };
 
@@ -29,4 +26,4 @@ buildGoModule {
     maintainers = with lib.maintainers; [ jfvillablanca ];
     mainProgram = "wait4x";
   };
-}
+})
diff --git a/pkgs/by-name/wa/wallabag/package.nix b/pkgs/by-name/wa/wallabag/package.nix
index 07f4247f9014..9ddfeb253cf9 100644
--- a/pkgs/by-name/wa/wallabag/package.nix
+++ b/pkgs/by-name/wa/wallabag/package.nix
@@ -14,16 +14,13 @@
 # After a package upgrade, empty the `var/cache` folder or unexpected
 # error will occur.
 
-let
+stdenv.mkDerivation (finalAttrs: {
   pname = "wallabag";
   version = "2.6.14";
-in
-stdenv.mkDerivation {
-  inherit pname version;
 
   # Release tarball includes vendored files
   src = fetchurl {
-    url = "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz";
+    url = "https://github.com/wallabag/wallabag/releases/download/${finalAttrs.version}/wallabag-${finalAttrs.version}.tar.gz";
     hash = "sha256-AEk0WuxZfazo4r4shcK453RCF/4V/VMDvKs4EXGe/w0=";
   };
 
@@ -51,8 +48,8 @@ stdenv.mkDerivation {
     '';
     license = lib.licenses.mit;
     homepage = "https://wallabag.org";
-    changelog = "https://github.com/wallabag/wallabag/releases/tag/${version}";
+    changelog = "https://github.com/wallabag/wallabag/releases/tag/${finalAttrs.version}";
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/wg/wgo/package.nix b/pkgs/by-name/wg/wgo/package.nix
index 49f3b5863da5..f691b9cc4ee0 100644
--- a/pkgs/by-name/wg/wgo/package.nix
+++ b/pkgs/by-name/wg/wgo/package.nix
@@ -4,17 +4,14 @@
   fetchFromGitHub,
 }:
 
-let
+buildGoModule (finalAttrs: {
   pname = "wgo";
   version = "0.6.2";
-in
-buildGoModule {
-  inherit pname version;
 
   src = fetchFromGitHub {
     owner = "bokwoon95";
     repo = "wgo";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-Z3adi1PQ5v0BxcjkOJZWeUxwLlLXpNuJxrQztV2pCiA=";
   };
 
@@ -40,4 +37,4 @@ buildGoModule {
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/wh/whisper-ctranslate2/package.nix b/pkgs/by-name/wh/whisper-ctranslate2/package.nix
index 083dd675b123..100c6839c8a7 100644
--- a/pkgs/by-name/wh/whisper-ctranslate2/package.nix
+++ b/pkgs/by-name/wh/whisper-ctranslate2/package.nix
@@ -6,18 +6,16 @@
   fetchFromGitHub,
   nix-update-script,
 }:
-let
+
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "whisper-ctranslate2";
   version = "0.5.6";
-in
-python3Packages.buildPythonApplication {
-  inherit pname version;
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Softcatala";
     repo = "whisper-ctranslate2";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-IgHTSOlF6fBX0oLWejKO5510e9M7ZTQf4CiIlb2xalM=";
   };
 
@@ -51,9 +49,9 @@ python3Packages.buildPythonApplication {
   meta = {
     description = "Whisper command line client compatible with original OpenAI client based on CTranslate2";
     homepage = "https://github.com/Softcatala/whisper-ctranslate2";
-    changelog = "https://github.com/Softcatala/whisper-ctranslate2/releases/tag/${version}";
+    changelog = "https://github.com/Softcatala/whisper-ctranslate2/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ happysalada ];
     mainProgram = "whisper-ctranslate2";
   };
-}
+})
diff --git a/pkgs/by-name/wi/wiseunpacker/package.nix b/pkgs/by-name/wi/wiseunpacker/package.nix
index ee414e6615b2..3a3aea1cd3df 100644
--- a/pkgs/by-name/wi/wiseunpacker/package.nix
+++ b/pkgs/by-name/wi/wiseunpacker/package.nix
@@ -4,17 +4,15 @@
   dotnetCorePackages,
   lib,
 }:
-let
-  version = "1.3.3";
+
+buildDotnetModule (finalAttrs: {
   pname = "WiseUnpacker";
-in
-buildDotnetModule {
-  inherit version pname;
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "mnadareski";
     repo = "WiseUnpacker";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-APbfo2D/p733AwNNByu5MvC9LA8WW4mAzq6t2w/YNrs=";
   };
 
@@ -38,4 +36,4 @@ buildDotnetModule {
     maintainers = [ lib.maintainers.gigahawk ];
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/by-name/wl/wl-kbptr/package.nix b/pkgs/by-name/wl/wl-kbptr/package.nix
index 99acf8635be1..11e58ed2b897 100644
--- a/pkgs/by-name/wl/wl-kbptr/package.nix
+++ b/pkgs/by-name/wl/wl-kbptr/package.nix
@@ -14,16 +14,14 @@
   wayland-protocols,
   wayland-scanner,
 }:
-let
+stdenv.mkDerivation (finalAttrs: {
   pname = "wl-kbptr";
   version = "0.4.1";
-in
-stdenv.mkDerivation {
-  inherit pname version;
+
   src = fetchFromGitHub {
     owner = "moverest";
     repo = "wl-kbptr";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Z0ECLxkJChGe2ggwFRuKJj+J6+KcTAlZclqdvBzZDzs=";
   };
 
@@ -56,7 +54,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://github.com/moverest/wl-kbptr";
     description = "Control the mouse pointer with the keyboard on Wayland";
-    changelog = "https://github.com/moverest/wl-kbptr/releases/tag/v${version}";
+    changelog = "https://github.com/moverest/wl-kbptr/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3;
     mainProgram = "wl-kbptr";
     maintainers = [
@@ -65,4 +63,4 @@ stdenv.mkDerivation {
     ];
     inherit (wayland.meta) platforms;
   };
-}
+})
diff --git a/pkgs/by-name/xe/xenon/package.nix b/pkgs/by-name/xe/xenon/package.nix
index 4436e2cb4fcd..2aa902a11f11 100644
--- a/pkgs/by-name/xe/xenon/package.nix
+++ b/pkgs/by-name/xe/xenon/package.nix
@@ -4,17 +4,13 @@
   python3,
 }:
 
-let
+python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "xenon";
   version = "0.9.3";
-in
-python3.pkgs.buildPythonApplication {
-
-  inherit pname version;
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-SnU42LoIql15BV+z4LI5PAvW19FqSrD83vAu8fEKQ/o=";
   };
 
@@ -37,4 +33,4 @@ python3.pkgs.buildPythonApplication {
     maintainers = with lib.maintainers; [ jfvillablanca ];
     mainProgram = "xenon";
   };
-}
+})