mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-03-08 01:24:09 +01:00
ca363a08a9
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
|
||
|---|---|---|
| .. | ||
| geant4 | ||
| gearlever | ||
| geary | ||
| gebaar-libinput | ||
| geckodriver | ||
| gedit | ||
| geek-life | ||
| geeqie | ||
| geesefs | ||
| gef | ||
| gefyra | ||
| gegl | ||
| geis | ||
| geist-font | ||
| gel | ||
| gelasio | ||
| gelly | ||
| gem | ||
| gema | ||
| gemget | ||
| gemini-cli | ||
| gemini-cli-bin | ||
| geminicommit | ||
| gemmi | ||
| gemrb | ||
| gemstash | ||
| gen-license | ||
| gen-oath-safe | ||
| gen6dns | ||
| genact | ||
| genann | ||
| gencfsm | ||
| gendef | ||
| genealogos-cli | ||
| genefer | ||
| genemichaels | ||
| genesys | ||
| genext2fs | ||
| gengetopt | ||
| genimage | ||
| genmap | ||
| genpass | ||
| genromfs | ||
| gensio | ||
| gensort | ||
| gentium | ||
| gentium-book | ||
| gentium-book-basic | ||
| gentium-plus | ||
| genxword | ||
| genymotion | ||
| genzai | ||
| geo | ||
| geoclock | ||
| geoclue2 | ||
| geocode-glib_2 | ||
| geogebra | ||
| geogebra6 | ||
| geogram | ||
| geographiclib | ||
| geoip | ||
| geoipjava | ||
| geoipupdate | ||
| geolite-legacy | ||
| geomcpp | ||
| geomyidae | ||
| geonkick | ||
| geopard | ||
| geos | ||
| geoserver | ||
| gepetto-viewer | ||
| gepetto-viewer-corba | ||
| geph | ||
| gephgui-wry | ||
| gephi | ||
| gerbera | ||
| gerbolyze | ||
| germinal | ||
| gerrit | ||
| gerrit-queue | ||
| gersemi | ||
| get-google-fonts | ||
| get-graphql-schema | ||
| get_iplayer | ||
| getdata | ||
| getdns | ||
| getdp | ||
| geteduroam | ||
| geteduroam-cli | ||
| geteltorito | ||
| geticons | ||
| getmail6 | ||
| getopt | ||
| getoptions | ||
| getxbook | ||
| gex | ||
| gexiv2 | ||