git: correct update script #314234
Merged
git: correct update script #314234
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Commit d994dab (treewide: remove git-and-tools directory, 2022-12-19) removed the git-and-tools subdirectory, which the Git update script still referred to. Correct that outdated reference.
me-and
added
0.kind: bug
ofborg
bot
added
10.rebuild-darwin: 0
13 tasks
| @@ -10,7 +10,7 @@ targetVersion="${1:-$latestTag}" | |||
| if [ ! "${oldVersion}" = "${targetVersion}" ]; then | |||
| update-source-version git "${targetVersion}" | |||
| nixpkgs="$(git rev-parse --show-toplevel)" | |||
| default_nix="$nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix" | |||
| default_nix="$nixpkgs/pkgs/applications/version-management/git/default.nix" | |||
There was a problem hiding this comment.
Shouldn't that rather be relative to $0?
There was a problem hiding this comment.
I aimed to make the minimal change to get this working; I have no objection to making more extensive changes, but I'd like to defer to folk with more experience on this!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commit d994dab (treewide: remove git-and-tools directory, 2022-12-19) removed the git-and-tools subdirectory, which the Git update script still referred to. Correct that outdated reference.
Description of changes
Correct path in the
update.shscript used for the Git package. This mistake appears to be the cause of the error mentioned in #312211 (review)This only changes a file referenced in a passthru, so AIUI it shouldn't cause Git (and all the many things that depend on Git) to need to be rebuilt.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.