diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-03-16 12:39:43 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-03-16 12:40:43 +0100 |
commit | 645c2189d14ee95d22efb08e42a2bb3ca7e74a04 (patch) | |
tree | 278455fd8ff0dd7cf1467daef52c1ae5f05fee06 | |
parent | 9bd988eb0f4c4aaa2c89d9898a846edb0dc9aa80 (diff) | |
download | nixlib-645c2189d14ee95d22efb08e42a2bb3ca7e74a04.tar nixlib-645c2189d14ee95d22efb08e42a2bb3ca7e74a04.tar.gz nixlib-645c2189d14ee95d22efb08e42a2bb3ca7e74a04.tar.bz2 nixlib-645c2189d14ee95d22efb08e42a2bb3ca7e74a04.tar.lz nixlib-645c2189d14ee95d22efb08e42a2bb3ca7e74a04.tar.xz nixlib-645c2189d14ee95d22efb08e42a2bb3ca7e74a04.tar.zst nixlib-645c2189d14ee95d22efb08e42a2bb3ca7e74a04.zip |
pythonPackages.pytest-django: unpin setuptools_scm
- unpin setuptools_scm - move to file in folder following guidelines - use PyPI/upstream name
-rw-r--r-- | pkgs/development/python-modules/pytest-django/default.nix (renamed from pkgs/development/python-modules/pytestdjango.nix) | 12 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/pytestdjango.nix b/pkgs/development/python-modules/pytest-django/default.nix index 5a8dd85f4bdb..48a5c043841a 100644 --- a/pkgs/development/python-modules/pytestdjango.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -1,5 +1,6 @@ { stdenv, buildPythonPackage, fetchurl , pytest, django, setuptools_scm +, fetchpatch }: buildPythonPackage rec { name = "pytest-django-${version}"; @@ -13,6 +14,17 @@ buildPythonPackage rec { buildInputs = [ pytest setuptools_scm ]; propagatedBuildInputs = [ django ]; + patches = [ + # Unpin setuptools-scm + (fetchpatch { + url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch"; + sha256 = "1mx06y4kz2zs41mb2h9bh5p4jc6s6hfsq6fghhsks5b7qak05xjp"; + }) + ]; + + # Complicated. Requires Django setup. + doCheck = false; + meta = with stdenv.lib; { description = "py.test plugin for testing of Django applications"; homepage = http://pytest-django.readthedocs.org/en/latest/; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f13e9abeddf..97dab697081d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5158,7 +5158,7 @@ in { }; }; - pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { }; + pytest-django = callPackage ../development/python-modules/pytest-django { }; pytest-fixture-config = buildPythonPackage rec { name = "${pname}-${version}"; |