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: 25af916eb4d3
Choose a base ref
...
head repository: NixOS/nix
compare: 8115c10e597a
Choose a head ref
  • 10 commits
  • 6 files changed
  • 4 contributors

Commits on Aug 31, 2018

  1. Update release notes 

    (cherry picked from commit 64d7d1a)
    @edolstra
    edolstra committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    e76eec8 View commit details
    Browse the repository at this point in the history

  2. Remove boost from the closure 

    This reduces the size of the closure by 45 MiB.

(cherry picked from commit 145db70)
    @edolstra
    edolstra committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    b542267 View commit details
    Browse the repository at this point in the history

  3. nix: Remove the -h flag 

    (cherry picked from commit 5e83b02)
    @edolstra
    edolstra committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    1fceed5 View commit details
    Browse the repository at this point in the history

  4. upgrade-nix: add --dry-run 

    (cherry picked from commit 4143977)
    @LnL7 @edolstra
    LnL7 authored and edolstra committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    88d2e29 View commit details
    Browse the repository at this point in the history

  5. upgrade-nix: resolve profile symlinks 

    The profile present in PATH is not necessarily the actual profile
location. User profiles are generally added as $HOME/.nix-profile
in which case the indirect profile link needs to be resolved first.

/home/user/.nix-profile -> /nix/var/nix/profiles/per-user/user/profile
/nix/var/nix/profiles/per-user/user/profile -> profile-15-link
/nix/var/nix/profiles/per-user/user/profile-14-link -> /nix/store/hyi4kkjh3bwi2z3wfljrkfymz9904h62-user-environment
/nix/var/nix/profiles/per-user/user/profile-15-link -> /nix/store/6njpl3qvihz46vj911pwx7hfcvwhifl9-user-environment

To upgrade nix here we want /nix/var/nix/profiles/per-user/user/profile-16-link
instead of /home/user/.nix-profile-1-link. The latter is not a gcroot
and would be garbage collected, resulting in a broken profile.

Fixes #2175

(cherry picked from commit d85bb48)
    @LnL7 @edolstra
    LnL7 authored and edolstra committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    2b25ffb View commit details
    Browse the repository at this point in the history

  6. fix error: unknown serve command 9 

    (cherry picked from commit 0767e40)
    @cleverca22 @edolstra
    cleverca22 authored and edolstra committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    8b0761b View commit details
    Browse the repository at this point in the history

  7. Add simple test for nix upgrade-nix 

    (cherry picked from commit 264e66f)
    @edolstra
    edolstra committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    d7b2c6c View commit details
    Browse the repository at this point in the history

  8. nix upgrade-nix: Improve error message if 'nix' is not in a profile 

    E.g.

  $ nix upgrade-nix
  error: directory '/home/eelco/Dev/nix/inst/bin' does not appear to be part of a Nix profile

instead of

  $ nix upgrade-nix
  error: '/home/eelco/Dev/nix/inst' is not a symlink

(cherry picked from commit f08b14c)
    @edolstra
    edolstra committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    f8fbab4 View commit details
    Browse the repository at this point in the history

  9. nix upgrade-nix: Handle .nix-profile being a link to .../profiles/per… 

    …-user/...

Also some cosmetic improvements.

(cherry picked from commit 39f1722)
    @edolstra
    edolstra committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    b7a37ab View commit details
    Browse the repository at this point in the history

  10. Docs: Fix install prefix 

    shell.nix defines the install prefix as $(pwd)/inst

(cherry picked from commit 8ad2def)
    @erikarvstedt @edolstra
    erikarvstedt authored and edolstra committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    8115c10 View commit details
    Browse the repository at this point in the history