dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

gnome.updateScript: avoid rebuilding the derivation

Browse Source 
Previously, a separate derivation was needed for each upper bound.

Since we are using bash specific features, let’s declare it explicitly.
This commit is contained in:
Jan Tojnar 2022-02-16 19:13:24 +01:00
parent 5b8320d446
commit 86a0a335dc
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/desktops/gnome/update.nix
View File

@ -1,33 +1,41 @@
{ stdenv, pkgs, lib, writeScript, python3, common-updater-scripts }:
{ stdenv, bash, pkgs, lib, writeScript, python3, common-updater-scripts }:
{ packageName, attrPath ? packageName, versionPolicy ? "tagged", freeze ? false }:
let
python = python3.withPackages (p: [ p.requests p.libversion ]);
package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs;
packageVersion = lib.getVersion package;
upperBoundFlag =
upperBound =
let
versionComponents = lib.versions.splitVersion packageVersion;
minorVersion = lib.versions.minor packageVersion;
minorAvailable = builtins.length versionComponents > 1 && builtins.match "[0-9]+" minorVersion != null;
nextMinor = builtins.fromJSON minorVersion + 1;
upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}";
in lib.optionalString (freeze && minorAvailable) ''--upper-bound="${upperBound}"'';
in lib.optionals (freeze && minorAvailable) [ upperBound ];
updateScript = writeScript "gnome-update-script" ''
#!${stdenv.shell}
#!${bash}/bin/bash
set -o errexit
attr_path="$1"
package_name="$2"
package_version="$3"
version_policy="$4"
flvFlags=("$package_name" "$version_policy" "stable")
if (( $# >= 5 )); then
upper_bound="$5"
flvFlags+=("--upper-bound=$upper_bound")
fi
PATH=${lib.makeBinPath [ common-updater-scripts python ]}
latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable" ${upperBoundFlag})
latest_tag=$(python "${./find-latest-version.py}" "''${flvFlags[@]}")
update-source-version "$attr_path" "$latest_tag"
echo '[ { "commitBody": "https://gitlab.gnome.org/GNOME/'$package_name'/-/compare/'$package_version'...'$latest_tag'" } ]'
'';
in {
name = "gnome-update-script";
command = [ updateScript attrPath packageName packageVersion versionPolicy ];
command = [ updateScript attrPath packageName packageVersion versionPolicy ] ++ upperBound;
supportedFeatures = [
"commit"
];