diff options
| author | Domen Kožar <domen@dev.si> | 2016-06-16 11:18:16 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-06-16 11:18:45 +0100 |
| commit | 5b7c6a11b5d50b8f28f74da828eda07bef806fa2 (patch) | |
| tree | 9b9f10f2520f300590d9123239d89b611e20b3fc /maintainers | |
| parent | 398837fd000df37956f99a4397c2bb1ddc0f0785 (diff) | |
| download | nixlib-5b7c6a11b5d50b8f28f74da828eda07bef806fa2.tar nixlib-5b7c6a11b5d50b8f28f74da828eda07bef806fa2.tar.gz nixlib-5b7c6a11b5d50b8f28f74da828eda07bef806fa2.tar.bz2 nixlib-5b7c6a11b5d50b8f28f74da828eda07bef806fa2.tar.lz nixlib-5b7c6a11b5d50b8f28f74da828eda07bef806fa2.tar.xz nixlib-5b7c6a11b5d50b8f28f74da828eda07bef806fa2.tar.zst nixlib-5b7c6a11b5d50b8f28f74da828eda07bef806fa2.zip | |
travis-ci: remount only on linux
Diffstat (limited to 'maintainers')
| -rwxr-xr-x | maintainers/scripts/travis-nox-review-pr.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index a366ac435bd1..092fc0cd9d07 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -13,10 +13,6 @@ if [[ $1 == nix ]]; then sudo mkdir /etc/nix sudo sh -c 'echo "build-max-jobs = 4" > /etc/nix/nix.conf' - # Nix builds in /tmp and we need exec support - sudo mount - sudo mount -o remount,exec /run - # Verify evaluation echo "=== Verifying that nixpkgs evaluates..." nix-env -f. -qa --json >/dev/null @@ -30,6 +26,11 @@ elif [[ $1 == build ]]; then if [[ $TRAVIS_OS_NAME == "osx" ]]; then echo "Skipping NixOS things on darwin" else + # Nix builds in /tmp and we need exec support + sudo mount -o remount,exec /run + sudo mount -o remount,exec /run/user + sudo mount + echo "=== Checking NixOS options" nix-build nixos/release.nix -A options --show-trace |