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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d9a90a4dfbbb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bcfd8e781093
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 4, 2017

  1. nix: short TMPDIR for tests on Darwin

    This fixes test failures due to overly long nix-daemon socket paths.
    robx committed Jul 4, 2017
    2
    Copy the full SHA
    57a0224 View commit details

Commits on Jul 6, 2017

  1. Merge pull request #27124 from robx/tmpdir

    nix: short TMPDIR for tests on Darwin (fixes #27121)
    edolstra authored Jul 6, 2017
    Copy the full SHA
    bcfd8e7 View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 pkgs/tools/package-management/nix/default.nix
3 changes: 3 additions & 0 deletions pkgs/tools/package-management/nix/default.nix
Original file line number Diff line number Diff line change
@@ -79,6 +79,9 @@ let

doInstallCheck = true;

# socket path becomes too long otherwise
preInstallCheck = lib.optional stdenv.isDarwin "export TMPDIR=/tmp";

separateDebugInfo = stdenv.isLinux;

crossAttrs = {