Unverified Commit ca363a08 authored by quantenzitrone's avatar quantenzitrone
Browse files

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
parent 2e510a66
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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";
  };
}
})
+3 −3
Original line number Diff line number Diff line
@@ -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";
  };
}
})
+4 −4
Original line number Diff line number Diff line
@@ -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";
  };
}
})
+4 −4
Original line number Diff line number Diff line
@@ -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;
  };
}
})
+4 −4
Original line number Diff line number Diff line
@@ -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;
  };
}
})
Loading