diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/common-updater | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/common-updater')
| -rw-r--r-- | nixpkgs/pkgs/common-updater/generic-updater.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/common-updater/git-updater.nix | 8 | ||||
| -rwxr-xr-x | nixpkgs/pkgs/common-updater/scripts/list-git-tags | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/common-updater/unstable-updater.nix | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/common-updater/generic-updater.nix b/nixpkgs/pkgs/common-updater/generic-updater.nix index df47df14b85b..7a919ff5845e 100644 --- a/nixpkgs/pkgs/common-updater/generic-updater.nix +++ b/nixpkgs/pkgs/common-updater/generic-updater.nix @@ -92,7 +92,7 @@ let if [ -n "$latest_tag" ]; then # print commands to commit the changes if [ "$version" != "$latest_tag" ]; then - pfile=$(EDITOR=echo ${nix}/bin/nix edit -f. "$attr_path") + pfile=$(EDITOR=echo ${nix}/bin/nix edit --extra-experimental-features nix-command -f. "$attr_path") echo " git add $pfile " >> ${fileForGitCommands} echo " git commit -m '$attr_path: $version -> $latest_tag'" >> ${fileForGitCommands} fi diff --git a/nixpkgs/pkgs/common-updater/git-updater.nix b/nixpkgs/pkgs/common-updater/git-updater.nix index 304bad9af60c..b68f4a29011d 100644 --- a/nixpkgs/pkgs/common-updater/git-updater.nix +++ b/nixpkgs/pkgs/common-updater/git-updater.nix @@ -1,4 +1,5 @@ -{ genericUpdater +{ lib +, genericUpdater , common-updater-scripts }: @@ -9,9 +10,12 @@ , rev-prefix ? "" , odd-unstable ? false , patchlevel-unstable ? false +# an explicit url is needed when src.meta.homepage or src.url don't +# point to a git repo (eg. when using fetchurl, fetchzip, ...) +, url ? null }: genericUpdater { inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable; - versionLister = "${common-updater-scripts}/bin/list-git-tags"; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${lib.optionalString (url != null) "--url=${url}"}"; } diff --git a/nixpkgs/pkgs/common-updater/scripts/list-git-tags b/nixpkgs/pkgs/common-updater/scripts/list-git-tags index 176e647eb2ea..86b4949f055d 100755 --- a/nixpkgs/pkgs/common-updater/scripts/list-git-tags +++ b/nixpkgs/pkgs/common-updater/scripts/list-git-tags @@ -31,7 +31,7 @@ done # By default we set url to src.url or src.meta.homepage if [[ -z "$url" ]]; then url="$(nix-instantiate $systemArg --eval -E \ - "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.url or $UPDATE_NIX_ATTR_PATH.src.meta.homepage" \ + "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.meta.homepage or $UPDATE_NIX_ATTR_PATH.src.url" \ | tr -d '"')" fi diff --git a/nixpkgs/pkgs/common-updater/unstable-updater.nix b/nixpkgs/pkgs/common-updater/unstable-updater.nix index 14f25a91601c..2be065f410e7 100644 --- a/nixpkgs/pkgs/common-updater/unstable-updater.nix +++ b/nixpkgs/pkgs/common-updater/unstable-updater.nix @@ -49,7 +49,7 @@ let # By default we set url to src.url if [[ -z "$url" ]]; then url="$(${nix}/bin/nix-instantiate $systemArg --eval -E \ - "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.url or $UPDATE_NIX_ATTR_PATH.src.meta.homepage" \ + "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.gitRepoUrl" \ | tr -d '"')" fi |