From 645c2189d14ee95d22efb08e42a2bb3ca7e74a04 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 16 Mar 2017 12:39:43 +0100
Subject: pythonPackages.pytest-django: unpin setuptools_scm

- unpin setuptools_scm
- move to file in folder following guidelines
- use PyPI/upstream name
---
 .../python-modules/pytest-django/default.nix       | 33 ++++++++++++++++++++++
 pkgs/development/python-modules/pytestdjango.nix   | 21 --------------
 pkgs/top-level/python-packages.nix                 |  2 +-
 3 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/pytest-django/default.nix
 delete mode 100644 pkgs/development/python-modules/pytestdjango.nix

diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
new file mode 100644
index 000000000000..48a5c043841a
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildPythonPackage, fetchurl
+, pytest, django, setuptools_scm
+, fetchpatch
+}:
+buildPythonPackage rec {
+  name = "pytest-django-${version}";
+  version = "3.1.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pytest-django/${name}.tar.gz";
+    sha256 = "02932m2sr8x22m4az8syr8g835g4ak77varrnw71n6xakmdcr303";
+  };
+
+  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/;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/python-modules/pytestdjango.nix b/pkgs/development/python-modules/pytestdjango.nix
deleted file mode 100644
index 5a8dd85f4bdb..000000000000
--- a/pkgs/development/python-modules/pytestdjango.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, buildPythonPackage, fetchurl
-, pytest, django, setuptools_scm
-}:
-buildPythonPackage rec {
-  name = "pytest-django-${version}";
-  version = "3.1.2";
-
-  src = fetchurl {
-    url = "mirror://pypi/p/pytest-django/${name}.tar.gz";
-    sha256 = "02932m2sr8x22m4az8syr8g835g4ak77varrnw71n6xakmdcr303";
-  };
-
-  buildInputs = [ pytest setuptools_scm ];
-  propagatedBuildInputs = [ django ];
-
-  meta = with stdenv.lib; {
-    description = "py.test plugin for testing of Django applications";
-    homepage = http://pytest-django.readthedocs.org/en/latest/;
-    license = licenses.bsd3;
-  };
-}
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}";
-- 
cgit 1.4.1