maintainers/scripts/update.nix: various fixes #62478
Merged
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
For update script parallelization, we have started calling builtins.toJSON on updateScripts, which triggers evaluation of paths and therefore their copying to Nix store. This breaks update scripts that assume that they exist in nixpkgs like dwarf-fortress. NixOS#61935 Let’s stringify the paths before JSONification to prevent the evaluation.
It makes little sense for update.nix to try to update overlays; for most people, they will point to a read-only repository most of the cases.
Previously we did not handle non-existant paths making the program crash. Let’s show a proper error.
Make calling update.py a little nicer
|
The clean up is extracted from #59372 |
jtojnar
added
the
6.topic: updaters
Previously, we escaped the old version in place for use in sed commands, and then had to use that in error messages. We can do better.
No need to try evaluate the URL twice as introduced in the original fix NixOS@cce4868
grep was not actually properly included by common-updater-scripts before 0105058 but I am not sure why would we ever need to add coreutils to PATH.
jtojnar
changed the title
ofborg
bot
added
6.topic: GNOME
lilyball
approved these changes
Jun 2, 2019
Make it clear that PWD is not fixed
|
Added info about PWD. |
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.
Motivation for this change
For update script parallelization, we have started calling
builtins.toJSONonupdateScripts, which triggers evaluation of paths and therefore their copyingto Nix store. This breaks update scripts that assume that they exist in
nixpkgslike
dwarf-fortress.#61935
Let’s stringify the paths before JSONification to prevent the evaluation.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)