diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-02-16 19:13:24 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-02-21 19:12:35 +0100 |
commit | 86a0a335dc5fdf25c84871499c7297c8f35653e2 (patch) | |
tree | 10d5f6c4d952ed558c48b068ca79f4c903407016 /pkgs | |
parent | 5b8320d446e18b4fd6faefa787944d22513ac1ee (diff) |
gnome.updateScript: avoid rebuilding the derivation
Previously, a separate derivation was needed for each upper bound. Since we are using bash specific features, let’s declare it explicitly.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/gnome/update.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome/update.nix b/pkgs/desktops/gnome/update.nix index 8335bb642fb1b..0b19f761a9007 100644 --- a/pkgs/desktops/gnome/update.nix +++ b/pkgs/desktops/gnome/update.nix @@ -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" ]; |