diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/common-updater | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/common-updater')
-rw-r--r-- | nixpkgs/pkgs/common-updater/generic-updater.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/common-updater/generic-updater.nix b/nixpkgs/pkgs/common-updater/generic-updater.nix index e75a6dd7ab05..25008d664b93 100644 --- a/nixpkgs/pkgs/common-updater/generic-updater.nix +++ b/nixpkgs/pkgs/common-updater/generic-updater.nix @@ -105,7 +105,10 @@ let fi # update the nix expression - ${common-updater-scripts}/bin/update-source-version "$attr_path" "$latest_tag" + ${common-updater-scripts}/bin/update-source-version --print-changes "$attr_path" "$latest_tag" + else + # No changes for commit protocol. + echo "[]" fi echo "" >> ${fileForGitCommands} @@ -114,4 +117,8 @@ let in { name = "generic-update-script"; command = [ updateScript name pname version attrPath versionLister ignoredVersions rev-prefix odd-unstable patchlevel-unstable ]; + supportedFeatures = [ + # Stdout must contain output according to the updateScript commit protocol when the update script finishes with a non-zero exit code. + "commit" + ]; } |