diff --git a/.travis.yml b/.travis.yml index 402347d5eda61..f99a6868cf565 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,24 @@ -language: python -python: "3.4" -sudo: required -dist: trusty -before_install: ./maintainers/scripts/travis-nox-review-pr.sh nix -install: ./maintainers/scripts/travis-nox-review-pr.sh nox -script: ./maintainers/scripts/travis-nox-review-pr.sh build +sudo: false +language: c + +before_install: + - bash <(curl -sSL https://github.com/robbinch/travis-nix-proot/raw/master/install) + - export PATH=$HOME/.travis-nix-proot/bin:$PATH + - travis-nix-proot setup + +install: + - travis-nix-proot nix-env -i git + - travis-nix-proot nix-env -i nox + +script: + - travis-nix-proot nix-env -f. -qa --json >/dev/null + - travis-nix-proot nix-build pkgs/top-level/release.nix -A tarball + #- travis-nix-proot nox-review pr 14943 + +before_cache: + - travis-nix-proot gc + - travis-nix-proot dump-db + +cache: + directories: + - $HOME/travis-nix-proot.cache diff --git a/pkgs/development/tools/misc/tinc/default.nix b/pkgs/development/tools/misc/tinc/default.nix index 44491fa0ef98f..8f6ea7dbc470d 100644 --- a/pkgs/development/tools/misc/tinc/default.nix +++ b/pkgs/development/tools/misc/tinc/default.nix @@ -7,7 +7,7 @@ }: mkDerivation { pname = "tinc"; - version = "20160419"; + version = "20160420"; src = fetchFromGitHub { owner = "sol"; repo = "tinc"; @@ -38,4 +38,5 @@ mkDerivation { homepage = "https://github.com/sol/tinc#readme"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.robbinch ]; + doCheck = false; }