public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next'

Browse Source
This commit is contained in:
Vladimír Čunát
2018-08-17 20:51:31 +02:00
parent aa5a93e21d cbabebcc2e
commit 209730208a
248 changed files with 1013 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/pygobject/default.nix
View File

@@ -19,7 +19,7 @@ buildPythonPackage rec {
./pygobject-2.28.6-gio-types-2.32.patch
];
configureFlags = "--disable-introspection";
configureFlags = [ "--disable-introspection" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib ];

4
pkgs/development/python-modules/pytest/default.nix
View File

@@ -27,10 +27,10 @@ buildPythonPackage rec {
runHook postCheck
'';
# Remove .pytest-cache when using py.test in a Nix build
# Remove .pytest_cache when using py.test in a Nix build
setupHook = writeText "pytest-hook" ''
postFixupHooks+=(
'find $out -name .pytest-cache -type d -exec rm -rf {} +'
'find $out -name .pytest_cache -type d -exec rm -rf {} +'
)
'';