From 942484324e544988f05ee321c78ddf54d095e0d2 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 22:04:53 -0400
Subject: [PATCH] pythonPackages.pysaml2: refactor move to python-modules

---
 .../python-modules/pysaml2/default.nix        | 66 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 38 +----------
 2 files changed, 67 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/development/python-modules/pysaml2/default.nix

diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix
new file mode 100644
index 000000000000..1e9ce18afb9a
--- /dev/null
+++ b/pkgs/development/python-modules/pysaml2/default.nix
@@ -0,0 +1,66 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+, repoze_who
+, paste
+, cryptography
+, pycrypto
+, pyopenssl
+, ipaddress
+, six
+, cffi
+, idna
+, enum34
+, pytz
+, setuptools
+, zope_interface
+, dateutil
+, requests
+, pyasn1
+, webob
+, decorator
+, pycparser
+, defusedxml
+, Mako
+, pytest
+, memcached
+, pymongo
+, mongodict
+, pkgs
+}:
+
+buildPythonPackage rec {
+  pname = "pysaml2";
+  version = "3.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0y2iw1dddcvi13xjh3l52z1mvnrbc41ik9k4nn7lwj8x5kimnk9n";
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "CVE-2016-10127.patch";
+      url = "https://sources.debian.net/data/main/p/python-pysaml2/3.0.0-5/debian/patches/fix-xxe-in-xml-parsing.patch";
+      sha256 = "184lkwdayjqiahzsn4yp15parqpmphjsb1z7zwd636jvarxqgs2q";
+    })
+  ];
+
+  propagatedBuildInputs = [ repoze_who paste cryptography pycrypto pyopenssl ipaddress six cffi idna enum34 pytz setuptools zope_interface dateutil requests pyasn1 webob decorator pycparser defusedxml ];
+  buildInputs = [ Mako pytest memcached pymongo mongodict pkgs.xmlsec ];
+
+  preConfigure = ''
+    sed -i 's/pymongo==3.0.1/pymongo/' setup.py
+  '';
+
+  # 16 failed, 427 passed, 17 error in 88.85 seconds
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/rohe/pysaml2";
+    description = "Python implementation of SAML Version 2 Standard";
+    license = licenses.asl20;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 678c7df705a3..335f9fe9b5b6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3253,43 +3253,7 @@ in {
 
   pysam = callPackage ../development/python-modules/pysam { };
 
-  pysaml2 = buildPythonPackage rec {
-    name = "pysaml2-${version}";
-    version = "3.0.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pysaml2/${name}.tar.gz";
-      sha256 = "0y2iw1dddcvi13xjh3l52z1mvnrbc41ik9k4nn7lwj8x5kimnk9n";
-    };
-
-    patches = [
-      (pkgs.fetchpatch {
-        name = "CVE-2016-10127.patch";
-        url = "https://sources.debian.net/data/main/p/python-pysaml2/3.0.0-5/debian/patches/fix-xxe-in-xml-parsing.patch";
-        sha256 = "184lkwdayjqiahzsn4yp15parqpmphjsb1z7zwd636jvarxqgs2q";
-      })
-    ];
-
-    propagatedBuildInputs = with self; [
-      repoze_who paste cryptography pycrypto pyopenssl ipaddress six cffi idna
-      enum34 pytz setuptools zope_interface dateutil requests pyasn1 webob decorator pycparser
-      defusedxml
-    ];
-    buildInputs = with self; [
-      Mako pytest memcached pymongo mongodict pkgs.xmlsec
-    ];
-
-    preConfigure = ''
-      sed -i 's/pymongo==3.0.1/pymongo/' setup.py
-    '';
-
-    # 16 failed, 427 passed, 17 error in 88.85 seconds
-    doCheck = false;
-
-    meta = with stdenv.lib; {
-      homepage = "https://github.com/rohe/pysaml2";
-    };
-  };
+  pysaml2 = callPackage ../development/python-modules/pysaml2 { };
 
   python-pushover = callPackage ../development/python-modules/pushover {};