From f1796b8be0472e6e790a07a18e5b4c02907dffe4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 30 Aug 2017 22:03:20 +0200
Subject: [PATCH] python.pkgs.service-identity: move expression

---
 .../service_identity/default.nix              | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +-----------
 2 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/service_identity/default.nix

diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix
new file mode 100644
index 00000000000..69f9d7bf3f5
--- /dev/null
+++ b/pkgs/development/python-modules/service_identity/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, characteristic
+, pyasn1
+, pyasn1-modules
+, pyopenssl
+, idna
+, attrs
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "service_identity";
+  version = "16.0.0";
+  name = "${pname}-${version}";
+
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0dih7i7d36nbllcxgfkvbnaj1wlzhwfnpr4b97dz74czylif4c06";
+  };
+
+  propagatedBuildInputs = [
+    characteristic pyasn1 pyasn1-modules pyopenssl idna attrs
+  ];
+
+  checkInputs = [
+    pytest
+  ];
+
+  checkPhase = ''
+    py.test
+  '';
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c6798d63602..a165531365c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25585,27 +25585,7 @@ EOF
 
   };
 
-  service-identity = buildPythonPackage rec {
-    name = "service-identity-${version}";
-    version = "16.0.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/service_identity/service_identity-${version}.tar.gz";
-      sha256 = "0dih7i7d36nbllcxgfkvbnaj1wlzhwfnpr4b97dz74czylif4c06";
-    };
-
-    propagatedBuildInputs = with self; [
-      characteristic pyasn1 pyasn1-modules pyopenssl idna attrs
-    ];
-
-    buildInputs = with self; [
-      pytest
-    ];
-
-    checkPhase = ''
-      py.test
-    '';
-  };
+  service-identity = callPackage ../development/python-modules/service_identity { };
 
   signedjson = buildPythonPackage rec {
     name = "signedjson-${version}";