Unverified Commit 18dc8a95 authored by quantenzitrone's avatar quantenzitrone
Browse files

various: switch buildPythonApplication packages to use finalAttrs

this shouldn't create any rebuilds

the following script was used to generate this:
```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 buildPythonApplication

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
    # meta
    sd -F '${meta' '${finalAttrs.meta' $file
    sd -F '= meta' '= finalAttrs.meta' $file
    sd -F 'inherit (meta' 'inherit (finalAttrs.meta' $file
    # pname (restored afterwards)
    sd -F 'pname}' 'finalAttrs.pname}' $file
    sd -F '${pname' '${finalAttrs.pname' $file
    sd -F '= pname' '= 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
    # other
    sd -F 'makeLibraryPath buildInputs' 'makeLibraryPath finalAttrs.buildInputs' $file
    sd -F 'nativeBuildInputs}' 'finalAttrs.nativeBuildInputs}' $file
    sd -F 'buildInputs}' 'finalAttrs.buildInputs}' $file
    sd -F 'propagatedBuildInputs}' 'finalAttrs.propagatedBuildInputs}' $file
    sd -F 'desktopItem}' 'finalAttrs.desktopItem}' $file
    sd -F 'runtimeLibs}' 'finalAttrs.runtimeLibs}' $file
    sd -F 'makePythonPath dependencies' 'makePythonPath finalAttrs.dependencies' $file
    sd -F 'makePythonPath propagatedBuildInputs' 'makePythonPath finalAttrs.propagatedBuildInputs' $file
    sd -F 'libPath}' 'finalAttrs.libPath}' $file
    sd -F 'runtimeDependencies}' 'finalAttrs.runtimeDependencies}' $file
    sd -F 'runtimeDeps}' 'finalAttrs.runtimeDeps}' $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:
- restoring files that cause changes in the number of lines
- restoring files that cause rebuilds
- restoring files that cause merge conflicts with staging
parent 78679f24
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
  python3Packages,
}:

python3Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication (finalAttrs: {
  pname = "20kly";
  version = "1.5.0";

@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "20kly";
    repo = "20kly";
    tag = "v${version}";
    tag = "v${finalAttrs.version}";
    sha256 = "1zxsxg49a02k7zidx3kgk2maa0vv0n1f9wrl5vch07sq3ghvpphx";
  };

@@ -45,4 +45,4 @@ python3Packages.buildPythonApplication rec {
    license = lib.licenses.gpl2Only;
    maintainers = with lib.maintainers; [ fgaz ];
  };
}
})
+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
  python3,
}:

python3.pkgs.buildPythonApplication rec {
python3.pkgs.buildPythonApplication (finalAttrs: {
  pname = "aab";
  version = "1.0.0-dev.5";
  pyproject = true;
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "glutanimate";
    repo = "anki-addon-builder";
    tag = "v${version}";
    tag = "v${finalAttrs.version}";
    hash = "sha256-92Xqxgb9MLhSIa5EN3Rdk4aJlRfzEWqKmXFe604Q354=";
  };

@@ -45,4 +45,4 @@ python3.pkgs.buildPythonApplication rec {
    license = lib.licenses.agpl3Only;
    maintainers = with lib.maintainers; [ eljamm ];
  };
}
})
+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
  python3Packages,
}:

python3Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication (finalAttrs: {
  pname = "aactivator";
  version = "2.0.0";
  pyproject = true;
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "Yelp";
    repo = "aactivator";
    tag = "v${version}";
    tag = "v${finalAttrs.version}";
    hash = "sha256-vnBDtLEvU1jHbb5/MXAulXaBaugdCZdLQSP2b8P6SiQ=";
  };

@@ -38,4 +38,4 @@ python3Packages.buildPythonApplication rec {
    mainProgram = "aactivator";
    maintainers = with lib.maintainers; [ keller00 ];
  };
}
})
+4 −4
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@
  librsvg,
}:

python3.pkgs.buildPythonApplication rec {
python3.pkgs.buildPythonApplication (finalAttrs: {
  pname = "accerciser";
  version = "3.48.0";

  pyproject = false;

  src = fetchurl {
    url = "mirror://gnome/sources/accerciser/${lib.versions.majorMinor version}/accerciser-${version}.tar.xz";
    url = "mirror://gnome/sources/accerciser/${lib.versions.majorMinor finalAttrs.version}/accerciser-${finalAttrs.version}.tar.xz";
    hash = "sha256-kCiOiQCidKOu4gUw6zkWRZlK6YZyIJFroPXEZ3v+n00=";
  };

@@ -71,11 +71,11 @@ python3.pkgs.buildPythonApplication rec {

  meta = {
    homepage = "https://gitlab.gnome.org/GNOME/accerciser";
    changelog = "https://gitlab.gnome.org/GNOME/accerciser/-/blob/${version}/NEWS?ref_type=tags";
    changelog = "https://gitlab.gnome.org/GNOME/accerciser/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
    description = "Interactive Python accessibility explorer";
    mainProgram = "accerciser";
    teams = [ lib.teams.gnome ];
    license = lib.licenses.bsd3;
    platforms = lib.platforms.linux;
  };
}
})
+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
  python3Packages,
}:

python3Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication (finalAttrs: {
  pname = "acd-cli";
  version = "0.3.2";
  format = "setuptools";
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "yadayada";
    repo = "acd_cli";
    tag = version;
    tag = finalAttrs.version;
    hash = "sha256-132CW5EcsgDZOeauBpNyXoFS2Q5rKPqqHIoIKobJDig=";
  };

@@ -47,4 +47,4 @@ python3Packages.buildPythonApplication rec {
    homepage = "https://github.com/yadayada/acd_cli";
    license = lib.licenses.gpl2;
  };
}
})
Loading