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/nix
base: f573ea7464c5
Choose a base ref
...
head repository: NixOS/nix
compare: fa37d03b3c44
Choose a head ref
  • 11 commits
  • 13 files changed
  • 5 contributors

Commits on Sep 19, 2018

  1. Bump version

    @edolstra
    edolstra committed Sep 19, 2018
    Copy the full SHA
    f364c91 View commit details
    Browse the repository at this point in the history

  2. Upgrade docs: improve the upgrade command 

    and make it more copy-pastable.

(cherry picked from commit 1915862)
    @ariutta @edolstra
    ariutta authored and edolstra committed Sep 19, 2018
    Copy the full SHA
    57ddc6c View commit details
    Browse the repository at this point in the history

  3. docs: document deprecated aliases 

    (cherry picked from commit 0cd8631)
    @grahamc @edolstra
    grahamc authored and edolstra committed Sep 19, 2018
    Copy the full SHA
    e811aa8 View commit details
    Browse the repository at this point in the history

  4. nix-shell: explain the merging property close to the example 

    (cherry picked from commit 10a7f19)
    @grahamc @edolstra
    grahamc authored and edolstra committed Sep 19, 2018
    Copy the full SHA
    cae9262 View commit details
    Browse the repository at this point in the history

  5. nix-shell: document double quotes being necessary for a simple Nix ex… 

    …pression in the shebang

(cherry picked from commit be9e356)
    @grahamc @edolstra
    grahamc authored and edolstra committed Sep 19, 2018
    Copy the full SHA
    74b612e View commit details
    Browse the repository at this point in the history

  6. nix-env: Fix segfault if -f argument is not a directory or a Nix expr… 

    …ession

Fixes #2425.

(cherry picked from commit 52f6d54)
    @edolstra
    edolstra committed Sep 19, 2018
    Copy the full SHA
    30b8ecf View commit details
    Browse the repository at this point in the history

  7. docs: change expired bzip2.org to archive.org 

    Fixes #2396.

(cherry picked from commit 5f3b72c)
    @vcunat @edolstra
    vcunat authored and edolstra committed Sep 19, 2018
    Copy the full SHA
    4d0929a View commit details
    Browse the repository at this point in the history

  8. Handle queryPathInfo() failure from substituters when fallback is ena… 

    …bled

Fixes #1990.

(cherry picked from commit 33c3f91)
    @edolstra
    edolstra committed Sep 19, 2018
    Copy the full SHA
    c0c0c6b View commit details
    Browse the repository at this point in the history

  9. download: fix size reported to progress bar 

    (cherry picked from commit 28418af)
    @dtzWill @edolstra
    dtzWill authored and edolstra committed Sep 19, 2018
    Copy the full SHA
    3f20275 View commit details
    Browse the repository at this point in the history

  10. If fallback is enabled, temporarily disable substituters after a failure 

    Otherwise, we just keep asking the substituter for other .narinfo
files, which can take a very long time due to retries/timeouts.

(cherry picked from commit bba3f0a)
    @edolstra
    edolstra committed Sep 19, 2018
    Copy the full SHA
    0999519 View commit details
    Browse the repository at this point in the history

  11. Fix build failure if parallel xz is not available 

    (cherry picked from commit 901dfc7)
    @edolstra
    edolstra committed Sep 19, 2018
    Copy the full SHA
    fa37d03 View commit details
    Browse the repository at this point in the history