diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 20:51:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 20:51:31 +0200 |
| commit | 209730208a2ec0e3158303271d058dc851f83b99 (patch) | |
| tree | 286b2abfb02d711233ae9b4f7f7b755de27843ac /pkgs/development/python-modules | |
| parent | aa5a93e21d77e2c2464b39a5f4dabbfebfb225b4 (diff) | |
| parent | cbabebcc2e3b884296fedf8591e04f59240b3939 (diff) | |
| download | nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.gz nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.bz2 nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.lz nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.xz nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.zst nixlib-209730208a2ec0e3158303271d058dc851f83b99.zip | |
Merge branch 'staging-next'
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/pygobject/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pytest/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 796fc992a7dc..56e8f1fa5eb6 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 5fda0994010e..0e3f89fa152f 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -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 {} +' ) ''; |