From 99ec6e3c08e7c09ac6acee187c6d2d27d9829b23 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 16 Oct 2018 18:23:51 -0400
Subject: pythonPackages.mozsvc: refactor move to python-modules

---
 pkgs/development/python-modules/mozsvc/default.nix | 34 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix                 | 24 +--------------
 2 files changed, 35 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/python-modules/mozsvc/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/mozsvc/default.nix b/pkgs/development/python-modules/mozsvc/default.nix
new file mode 100644
index 000000000000..b7fed9e6ad98
--- /dev/null
+++ b/pkgs/development/python-modules/mozsvc/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, fetchurl
+, pyramid
+, simplejson
+, konfig
+}:
+
+buildPythonPackage rec {
+  pname = "mozsvc";
+  version = "0.8";
+
+  src = fetchgit {
+    url = https://github.com/mozilla-services/mozservices.git;
+    rev = "refs/tags/${version}";
+    sha256 = "1zci2ikk83mf7va88c83dr6snfh4ddjqw0lsg3y29qk5nxf80vx2";
+  };
+
+  patches = stdenv.lib.singleton (fetchurl {
+    url = https://github.com/nbp/mozservices/commit/f86c0b0b870cd8f80ce90accde9e16ecb2e88863.diff;
+    sha256 = "1lnghx821f6dqp3pa382ka07cncdz7hq0mkrh44d0q3grvrlrp9n";
+  });
+
+  doCheck = false; # lazy packager
+  propagatedBuildInputs = [ pyramid simplejson konfig ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mozilla-services/mozservices;
+    description = "Various utilities for Mozilla apps";
+    license = licenses.mpl20;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 05a17f42d76a..aad7c88f2e40 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2820,29 +2820,7 @@ in {
 
   mox = callPackage ../development/python-modules/mox { };
 
-  mozsvc = buildPythonPackage rec {
-    name = "mozsvc-${version}";
-    version = "0.8";
-
-    src = pkgs.fetchgit {
-      url = https://github.com/mozilla-services/mozservices.git;
-      rev = "refs/tags/${version}";
-      sha256 = "1zci2ikk83mf7va88c83dr6snfh4ddjqw0lsg3y29qk5nxf80vx2";
-    };
-
-    patches = singleton (pkgs.fetchurl {
-      url = https://github.com/nbp/mozservices/commit/f86c0b0b870cd8f80ce90accde9e16ecb2e88863.diff;
-      sha256 = "1lnghx821f6dqp3pa382ka07cncdz7hq0mkrh44d0q3grvrlrp9n";
-    });
-
-    doCheck = false; # lazy packager
-    propagatedBuildInputs = with self; [ pyramid simplejson konfig ];
-
-    meta = {
-      homepage = https://github.com/mozilla-services/mozservices;
-      description = "Various utilities for Mozilla apps";
-    };
-  };
+  mozsvc = callPackage ../development/python-modules/mozsvc { };
 
   mpmath = buildPythonPackage rec {
     name = "mpmath-0.19";
-- 
cgit 1.4.1