diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-20 13:31:14 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-20 13:31:14 +0100 |
| commit | 1623c8371c48a50ff8a4adeace47fe3e1a7c1117 (patch) | |
| tree | dc17c002272a2536cceb4cf6cb47f122cb1d50f2 /pkgs/development/python-modules/natsort | |
| parent | b4d9aaabda21957cb6cbe263e99ac43496e25873 (diff) | |
| download | nixpkgs-1623c8371c48a50ff8a4adeace47fe3e1a7c1117.tar nixpkgs-1623c8371c48a50ff8a4adeace47fe3e1a7c1117.tar.gz nixpkgs-1623c8371c48a50ff8a4adeace47fe3e1a7c1117.tar.bz2 nixpkgs-1623c8371c48a50ff8a4adeace47fe3e1a7c1117.tar.lz nixpkgs-1623c8371c48a50ff8a4adeace47fe3e1a7c1117.tar.xz nixpkgs-1623c8371c48a50ff8a4adeace47fe3e1a7c1117.tar.zst nixpkgs-1623c8371c48a50ff8a4adeace47fe3e1a7c1117.zip | |
buildPythonPackage: rename nix_run_setup.py to nix_run_setup
If the extension is .py it tends to be picked up by tools, breaking for example tests.
Diffstat (limited to 'pkgs/development/python-modules/natsort')
| -rw-r--r-- | pkgs/development/python-modules/natsort/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/natsort/setup.patch | 20 |
2 files changed, 1 insertions, 23 deletions
diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 4fc1f7255c6..8e81f923b91 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -39,9 +39,7 @@ buildPythonPackage rec { sha256 = "9ffbfb74bf3fc3905be1b9b052ed865675651e38fcd972ed1ed5c64a02f93cbd"; }; - # do not run checks on nix_run_setup.py - patches = lib.singleton ./setup.patch - ++ lib.optional (isPy35 || isPy36) ./python-3.6.3-test-failures.patch; + patches = lib.optional (isPy35 || isPy36) ./python-3.6.3-test-failures.patch; # testing based on project's tox.ini checkPhase = '' diff --git a/pkgs/development/python-modules/natsort/setup.patch b/pkgs/development/python-modules/natsort/setup.patch deleted file mode 100644 index 4c52b740152..00000000000 --- a/pkgs/development/python-modules/natsort/setup.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index 604994d..e38c3ec 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -6,6 +6,7 @@ formats = gztar - - [tool:pytest] - flakes-ignore = -+ nix_run_setup.py ALL - natsort/compat/py23.py UndefinedName - natsort/__init__.py UnusedImport - natsort/compat/* UnusedImport -@@ -14,6 +15,7 @@ flakes-ignore = - test_natsort/test_locale_help.py UnusedImport RedefinedWhileUnused - test_natsort/compat/* UnusedImport - pep8ignore = -+ nix_run_setup.py ALL - natsort/ns_enum.py E126 E241 E123 E221 - test_natsort/test_*.py E501 E241 E221 - test_natsort/test_natsort_keygen.py E501 E241 E221 E701 |