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: 743583b907f9
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ea59f09946b8
Choose a head ref
  • 10 commits
  • 4 files changed
  • 1 contributor

Commits on Jun 2, 2019

  1. maintainers/scripts/update.nix: Do not store updateScripts

    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.
    
    #61935
    
    Let’s stringify the paths before JSONification to prevent the evaluation.
    jtojnar committed Jun 2, 2019
    Copy the full SHA
    fa1bbe6 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    ea3ed0c View commit details
    Browse the repository at this point in the history
  3. maintainers/scripts/update.nix: ignore overlays

    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.
    jtojnar committed Jun 2, 2019
    Copy the full SHA
    36b2012 View commit details
    Browse the repository at this point in the history
  4. maintainers/scripts/update.nix: handle null paths

    Previously we did not handle non-existant paths making the program crash.
    Let’s show a proper error.
    jtojnar committed Jun 2, 2019
    Copy the full SHA
    c3dd31f View commit details
    Browse the repository at this point in the history
  5. maintainers/scripts/update.nix: Clean up

    Make calling update.py a little nicer
    jtojnar committed Jun 2, 2019
    Copy the full SHA
    e98c804 View commit details
    Browse the repository at this point in the history
  6. common-updater-scripts: keep the unescaped oldVersion

    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.
    jtojnar committed Jun 2, 2019
    Copy the full SHA
    1b507be View commit details
    Browse the repository at this point in the history
  7. common-updater-scripts: simplify fetchgit fix

    No need to try evaluate the URL twice as introduced in the original fix
    cce4868
    jtojnar committed Jun 2, 2019
    Copy the full SHA
    5751988 View commit details
    Browse the repository at this point in the history
  8. gnome3.updateScript: clean up PATH

    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 committed Jun 2, 2019
    Copy the full SHA
    9f6a9ce View commit details
    Browse the repository at this point in the history
  9. doc: document PWD for passthru.updateScript

    Make it clear that PWD is not fixed
    jtojnar committed Jun 2, 2019
    Copy the full SHA
    431dc97 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. maintainers/scripts/update.nix: various fixes (#62478)

    maintainers/scripts/update.nix: various fixes
    jtojnar committed Jun 4, 2019
    Copy the full SHA
    ea59f09 View commit details
    Browse the repository at this point in the history