Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: a001d7cdde02
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f18b83859e74
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 25, 2020

  1. maintainers/scripts/update.nix: allow updating overlays 

    (cherry picked from commit bacb096)
    @jtojnar @worldofpeace
    jtojnar authored and worldofpeace committed Apr 25, 2020
    Copy the full SHA
    2cd74ac View commit details
    Browse the repository at this point in the history

  2. common-updater-scripts: Handle errors in src hashing 

    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
    jtojnar authored and worldofpeace committed Apr 25, 2020
    Copy the full SHA
    e6825ab View commit details
    Browse the repository at this point in the history

  3. common-updater-scripts: Fix replacing SRI hashes 

    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)
    @jtojnar @worldofpeace
    jtojnar authored and worldofpeace committed Apr 25, 2020
    Copy the full SHA
    8ccd53f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #85975 from worldofpeace/common-updater-backports 

    [20.03] common-updater-scripts: Handle errors in src hashing
    @worldofpeace
    worldofpeace committed Apr 25, 2020
    Copy the full SHA
    f18b838 View commit details
    Browse the repository at this point in the history