various: use only finalAttrs everywhere where finalAttrs and rec was used at the same time (#493141)

pkgs/by-name/bi/bisq2/package.nix

@@ -61,7 +61,7 @@ let
     libv4l
   ];
 in
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   inherit version;
 
   pname = "bisq2";
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: rec {
       export GNUPGHOME=./gnupg
       mkdir -m 700 -p $GNUPGHOME
       ln -s $downloadedFile ./Bisq-${version}.deb
-      ln -s ${signature} ./signature.asc
+      ln -s ${finalAttrs.signature} ./signature.asc
       gpg --import ${publicKey."E222AA02"}
       gpg --import ${publicKey."387C8307"}
       gpg --batch --verify signature.asc Bisq-${version}.deb

pkgs/by-name/gr/grafana-alloy/package.nix

@@ -15,7 +15,7 @@
   useLLD ? stdenv.hostPlatform.isArmv7,
 }:
 
-buildGoModule (finalAttrs: rec {
+buildGoModule (finalAttrs: {
   pname = "grafana-alloy";
   version = "1.12.2";
   src = fetchFromGitHub {
@@ -32,10 +32,10 @@ buildGoModule (finalAttrs: rec {
 
   frontend = buildNpmPackage {
     pname = "alloy-frontend";
-    inherit version src;
+    inherit (finalAttrs) version src;
 
-    inherit npmDeps;
-    sourceRoot = "${src.name}/internal/web/ui";
+    inherit (finalAttrs) npmDeps;
+    sourceRoot = "${finalAttrs.src.name}/internal/web/ui";
 
     installPhase = ''
       runHook preInstall
@@ -88,7 +88,7 @@ buildGoModule (finalAttrs: rec {
 
   patchPhase = ''
     # Copy frontend build in
-    cp -va "${frontend}/share" "internal/web/ui/dist"
+    cp -va "${finalAttrs.frontend}/share" "internal/web/ui/dist"
   '';
 
   subPackages = [
@@ -135,7 +135,7 @@ buildGoModule (finalAttrs: rec {
       ];
     };
     # for nix-update to be able to find and update the hash
-    inherit npmDeps;
+    inherit (finalAttrs) npmDeps;
   };
 
   meta = {

pkgs/by-name/hy/hydra-check/package.nix

@@ -12,14 +12,14 @@
   cacert,
 }:
 
-rustPlatform.buildRustPackage (finalAttrs: rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hydra-check";
   version = "2.0.5";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "hydra-check";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-rOqLAI0r11Tfi6crKAxnj/HHBgUKcCGb4MCdxqLv4uE=";
   };
 

pkgs/by-name/id/ida-free/package.nix

@@ -32,13 +32,13 @@
   libxcb,
   zlib,
 }:
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ida-free";
   version = "9.2";
 
   src = requireFile {
-    name = "ida-free-pc_${lib.replaceStrings [ "." ] [ "" ] version}_x64linux.run";
-    url = "https://my.hex-rays.com/dashboard/download-center/installers/release/${version}/ida-free";
+    name = "ida-free-pc_${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}_x64linux.run";
+    url = "https://my.hex-rays.com/dashboard/download-center/installers/release/${finalAttrs.version}/ida-free";
     hash = "sha256-CQm9phkqLXhht4UQxooKmhmiGuW3lV8RIJuDrm52aNw=";
   };
 
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: rec {
     libxcb-cursor
     zlib
   ];
-  buildInputs = runtimeDependencies;
+  buildInputs = finalAttrs.runtimeDependencies;
 
   # IDA comes with its own Qt6, some dependencies are missing in the installer.
   autoPatchelfIgnoreMissingDeps = [

pkgs/by-name/ma/manticoresearch/columnar.nix

@@ -66,13 +66,13 @@ let
       platforms = lib.platforms.all;
     };
   });
-  streamvbyte = stdenv.mkDerivation (finalAttrs: rec {
+  streamvbyte = stdenv.mkDerivation (finalAttrs: {
     pname = "streamvbyte";
     version = "efdd9dace81a4a8f844267631879b500c6d913cf"; # see SVB_GITHUB in columnar's cmake/GetStreamvbyte.cmake
     src = fetchFromGitHub {
       owner = "manticoresoftware";
       repo = "streamvbyte";
-      rev = version;
+      rev = finalAttrs.version;
       hash = "sha256-a9E1aWBY/P7wI+kgHqhEiD3THctFfeFcy658RcNpHfQ=";
     };
     nativeBuildInputs = [

pkgs/by-name/ro/roslyn-ls/package.nix

@@ -35,14 +35,14 @@ let
 
   project = "Microsoft.CodeAnalysis.LanguageServer";
 in
-buildDotnetModule (finalAttrs: rec {
+buildDotnetModule (finalAttrs: {
   inherit pname dotnet-sdk dotnet-runtime;
 
   vsVersion = "2.123.34-prerelease";
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
-    rev = "VSCode-CSharp-${vsVersion}";
+    rev = "VSCode-CSharp-${finalAttrs.vsVersion}";
     hash = "sha256-UirJNrW1qcxt61Hsyfe/dYO1N2WH8Tr1mctTEUZ5pSs=";
   };
 
@@ -139,7 +139,7 @@ buildDotnetModule (finalAttrs: rec {
             ''
               HOME=$TMPDIR
               expect <<"EOF"
-                spawn ${meta.mainProgram} --stdio --logLevel Information --extensionLogDirectory log
+                spawn ${finalAttrs.meta.mainProgram} --stdio --logLevel Information --extensionLogDirectory log
                 expect_before timeout {
                   send_error "timeout!\n"
                   exit 1
@@ -167,7 +167,7 @@ buildDotnetModule (finalAttrs: rec {
   meta = {
     homepage = "https://github.com/dotnet/vscode-csharp";
     description = "Language server behind C# Dev Kit for Visual Studio Code";
-    changelog = "https://github.com/dotnet/vscode-csharp/releases/tag/v${vsVersion}";
+    changelog = "https://github.com/dotnet/vscode-csharp/releases/tag/v${finalAttrs.vsVersion}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ konradmalik ];
     mainProgram = "Microsoft.CodeAnalysis.LanguageServer";

pkgs/development/tools/godot/common.nix

@@ -340,7 +340,7 @@ let
           }
         );
 
-      attrs = finalAttrs: rec {
+      attrs = finalAttrs: {
         pname = "godot${suffix}";
         inherit version;