From 0c139e218677313219f094736adfa448faa7ca12 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril@gmail.com>
Date: Tue, 5 Dec 2017 22:28:58 +0000
Subject: [PATCH] tokenserver: move to python-modules

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

diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix
new file mode 100644
index 00000000000..af7acbc0218
--- /dev/null
+++ b/pkgs/development/python-modules/tokenserver/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, testfixtures
+, cornice
+, mozsvc
+, pybrowserid
+, tokenlib
+, pymysql
+, umemcache
+, hawkauthlib
+, alembic
+, pymysqlsa
+, paste
+, boto
+}:
+
+buildPythonPackage rec {
+  name = "tokenserver-${version}";
+  version = "1.2.27";
+
+  src = fetchgit {
+    url = https://github.com/mozilla-services/tokenserver.git;
+    rev = "refs/tags/${version}";
+    sha256 = "0il3bgjld495g9gxvvrm56kpan5swaizzg216qz3zxmb6w9ly3fm";
+  };
+
+  doCheck = false;
+  buildInputs = [ testfixtures ];
+  propagatedBuildInputs = [ cornice mozsvc pybrowserid tokenlib
+    pymysql umemcache hawkauthlib alembic pymysqlsa paste boto ];
+
+  meta = {
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd1dfa6a37d..d94bbd6c6aa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -374,6 +374,8 @@ in {
     hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; };
   };
 
+  tokenserver = callPackage ../development/python-modules/tokenserver {};
+
   unifi = callPackage ../development/python-modules/unifi { };
 
   pyunbound = callPackage ../tools/networking/unbound/python.nix { };
@@ -19182,26 +19184,6 @@ EOF
     '';
   };
 
-  tokenserver = buildPythonPackage rec {
-    name = "tokenserver-${version}";
-    version = "1.2.27";
-
-    src = pkgs.fetchgit {
-      url = https://github.com/mozilla-services/tokenserver.git;
-      rev = "refs/tags/${version}";
-      sha256 = "0il3bgjld495g9gxvvrm56kpan5swaizzg216qz3zxmb6w9ly3fm";
-    };
-
-    doCheck = false;
-    buildInputs = [ self.testfixtures ];
-    propagatedBuildInputs = with self; [ cornice mozsvc pybrowserid tokenlib
-      pymysql umemcache hawkauthlib alembic pymysqlsa paste boto ];
-
-    meta = {
-      platforms = platforms.all;
-    };
-  };
-
   testfixtures = callPackage ../development/python-modules/testfixtures {};
 
   tissue = buildPythonPackage rec {