diff options
| author | Domen Kožar <domen@dev.si> | 2016-05-31 12:59:24 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-05-31 12:59:24 +0100 |
| commit | d47dca41cedfba4b700f872b0a01a03ba6d31c7c (patch) | |
| tree | b7506c688af63e9908c808b3df84cb92071b8507 /maintainers | |
| parent | c64a3de27c3ee5ef9052ad85390d99cac02995b5 (diff) | |
| download | nixpkgs-d47dca41cedfba4b700f872b0a01a03ba6d31c7c.tar nixpkgs-d47dca41cedfba4b700f872b0a01a03ba6d31c7c.tar.gz nixpkgs-d47dca41cedfba4b700f872b0a01a03ba6d31c7c.tar.bz2 nixpkgs-d47dca41cedfba4b700f872b0a01a03ba6d31c7c.tar.lz nixpkgs-d47dca41cedfba4b700f872b0a01a03ba6d31c7c.tar.xz nixpkgs-d47dca41cedfba4b700f872b0a01a03ba6d31c7c.tar.zst nixpkgs-d47dca41cedfba4b700f872b0a01a03ba6d31c7c.zip | |
try using nox from nixpkgs (#15857)
* try using nox from nixpkgs * release.nix: block on nox since otherwise travis-ci will fail hard
Diffstat (limited to 'maintainers')
| -rwxr-xr-x | maintainers/scripts/travis-nox-review-pr.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index 02e9cbefb34..ffe817bc8be 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -17,9 +17,9 @@ if [[ $1 == nix ]]; then echo "=== Verifying that nixpkgs evaluates..." nix-env -f. -qa --json >/dev/null elif [[ $1 == nox ]]; then + source $HOME/.nix-profile/etc/profile.d/nix.sh echo "=== Installing nox..." - git clone -q https://github.com/madjar/nox - pip --quiet install -e nox + nix-build -A nox '<nixpkgs>' elif [[ $1 == build ]]; then source $HOME/.nix-profile/etc/profile.d/nix.sh @@ -38,7 +38,7 @@ elif [[ $1 == build ]]; then else echo "=== Checking PR" - if ! nox-review pr ${TRAVIS_PULL_REQUEST}; then + if ! nix-shell -p nox --run "nox-review pr ${TRAVIS_PULL_REQUEST}"; then if sudo dmesg | egrep 'Out of memory|Killed process' > /tmp/oom-log; then echo "=== The build failed due to running out of memory:" cat /tmp/oom-log |