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: 3e574c3691fb
Choose a base ref
...
head repository: NixOS/nix
compare: 026f4f9ae881
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 19, 2017

  1. macOS: Ugly hack to make the tests succeed 

    Sandboxes cannot be nested, so if Nix's build runs inside a sandbox,
it cannot use a sandbox itself. I don't see a clean way to detect
whether we're in a sandbox, so use a test-specific hack.

#1413
(cherry picked from commit 1888f78)
    @edolstra
    edolstra committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    11dd08f View commit details
    Browse the repository at this point in the history

  2. macOS: Remove flags 

    In particular, UF_IMMUTABLE (uchg) needs to be cleared to allow the
path to be garbage-collected or optimised.

See NixOS/nixpkgs#25819.
+       the file from being garbage-collected.

(cherry picked from commit b5bdfde)
    @edolstra
    edolstra committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    026f4f9 View commit details
    Browse the repository at this point in the history