Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[20.03] common-updater-scripts: Handle errors in src hashing #85975

Merged
merged 3 commits into from Apr 25, 2020
Merged

[20.03] common-updater-scripts: Handle errors in src hashing #85975

merged 3 commits into from Apr 25, 2020

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

Backports #80562

@jtojnar suggested we backport this, and it's a good idea if we run this script on the release branch (ref #85968)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jtojnar @worldofpeace
maintainers/scripts/update.nix: allow updating overlays
2cd74ac 
(cherry picked from commit bacb096)
@jtojnar @worldofpeace
common-updater-scripts: Handle errors in src hashing
e6825ab 
Previously, when downloading src failed for other reason than hash mismatch,
the error ended up in newHash. This made evaluation fail since the error message
is not valid hash. Now the failure will make newHash empty.

It is also much cleaner than previously since \K is very cool thing
and we no longer grep for legacy messages.

(cherry picked from commit 2e9eb44)
@jtojnar @worldofpeace
common-updater-scripts: Fix replacing SRI hashes
8ccd53f 
SRI hashes (base64 encoded) can contain + sign which is a special character
in extended regular expressions so it needs to be escaped.

(cherry picked from commit 09a4a05)
@worldofpeace worldofpeace merged commit f18b838 into NixOS:release-20.03 Apr 25, 2020
@worldofpeace worldofpeace deleted the common-updater-backports branch April 25, 2020 01:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@worldofpeace @jtojnar