ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17256 from matthewbauer/patch-4

Browse Source 
Travis fixes
This commit is contained in:
Domen Kožar 2016-08-13 14:17:59 +02:00 committed by GitHub
commit 49222660fc
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -11,10 +11,10 @@ matrix:
dist: trusty
before_script:
- sudo mount -o remount,exec,size=2G,mode=755 /run/user
script: ./maintainers/scripts/travis-nox-review-pr.sh pr
script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
- os: osx
osx_image: xcode7.3
script: ./maintainers/scripts/travis-nox-review-pr.sh pr
script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
git:
depth: 1
env:

9
maintainers/scripts/travis-nox-review-pr.sh
View File

@ -44,6 +44,13 @@ while test -n "$1"; do
nix-shell --packages nixpkgs-lint --run "nixpkgs-lint -f $TRAVIS_BUILD_DIR"
;;
nox)
echo "=== Fetching Nox from binary cache"
# build nox silently so it's not in the log
nix-build "<nixpkgs>" -A nox
;;
pr)
if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
echo "=== No pull request found"
@ -55,7 +62,7 @@ while test -n "$1"; do
token="--token $GITHUB_TOKEN"
fi
nix-shell --packages nox git --run "nox-review pr --slug $TRAVIS_REPO_SLUG $token $TRAVIS_PULL_REQUEST"
nix-shell --packages nox --run "nox-review pr --slug $TRAVIS_REPO_SLUG $token $TRAVIS_PULL_REQUEST"
fi
;;

4
pkgs/tools/package-management/nox/default.nix
View File

@ -1,4 +1,4 @@
{ lib, pythonPackages, fetchurl }:
{ lib, pythonPackages, fetchurl, git }:
pythonPackages.buildPythonApplication rec {
name = "nox-${version}";
@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "11f6css8rnh7qz55z7i81cnb5h9ys98fqxq3fps3hsh64zlydj52";
};
buildInputs = [ pythonPackages.pbr ];
buildInputs = [ pythonPackages.pbr git ];
propagatedBuildInputs = with pythonPackages; [
dogpile_cache