about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Ostrouchov <chris.ostrouchov@gmail.com>2018-10-15 17:49:46 -0400
committerFrederik Rietdijk <fridh@fridh.nl>2018-10-17 07:46:56 +0200
commit0edde48336aaf204a4a48a7ea90ac67f0f51248c (patch)
tree39d56dafa9f7545793478edaddfa48123560590b
parentf5a4b625dbb0ba3e56befbd0c1f61bda434fc8dd (diff)
downloadnixlib-0edde48336aaf204a4a48a7ea90ac67f0f51248c.tar
nixlib-0edde48336aaf204a4a48a7ea90ac67f0f51248c.tar.gz
nixlib-0edde48336aaf204a4a48a7ea90ac67f0f51248c.tar.bz2
nixlib-0edde48336aaf204a4a48a7ea90ac67f0f51248c.tar.lz
nixlib-0edde48336aaf204a4a48a7ea90ac67f0f51248c.tar.xz
nixlib-0edde48336aaf204a4a48a7ea90ac67f0f51248c.tar.zst
nixlib-0edde48336aaf204a4a48a7ea90ac67f0f51248c.zip
pythonPackages.memcached: refactor move to python-modules
-rw-r--r--pkgs/development/python-modules/memcached/default.nix26
-rw-r--r--pkgs/top-level/python-packages.nix18
2 files changed, 27 insertions, 17 deletions
diff --git a/pkgs/development/python-modules/memcached/default.nix b/pkgs/development/python-modules/memcached/default.nix
new file mode 100644
index 000000000000..854f7440daa1
--- /dev/null
+++ b/pkgs/development/python-modules/memcached/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, fetchPypi
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "memcached-1.51";
+  version = "1.51";
+
+  src = if isPy3k then fetchPypi {
+    inherit pname version;
+    sha256 = "0na8b369q8fivh3y0nvzbvhh3lgvxiyyv9xp93cnkvwfsr8mkgkw";
+  } else fetchurl {
+    url = "http://ftp.tummy.com/pub/python-memcached/old-releases/python-${pname}-${version}.tar.gz";
+    sha256 = "124s98m6hvxj6x90d7aynsjfz878zli771q96ns767r2mbqn7192";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Python API for communicating with the memcached distributed memory object cache daemon";
+    homepage = http://www.tummy.com/Community/software/python-memcached/;
+    license = licenses.psfl;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f815b0c69b4..ea3c013fe13e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5839,23 +5839,7 @@ in {
 
   meinheld = callPackage ../development/python-modules/meinheld { };
 
-  memcached = buildPythonPackage rec {
-    name = "memcached-1.51";
-
-    src = if isPy3k then pkgs.fetchurl {
-      url = "mirror://pypi/p/python3-memcached/python3-${name}.tar.gz";
-      sha256 = "0na8b369q8fivh3y0nvzbvhh3lgvxiyyv9xp93cnkvwfsr8mkgkw";
-    } else pkgs.fetchurl {
-      url = "http://ftp.tummy.com/pub/python-memcached/old-releases/python-${name}.tar.gz";
-      sha256 = "124s98m6hvxj6x90d7aynsjfz878zli771q96ns767r2mbqn7192";
-    };
-
-    meta = {
-      description = "Python API for communicating with the memcached distributed memory object cache daemon";
-      homepage = http://www.tummy.com/Community/software/python-memcached/;
-    };
-  };
-
+  memcached = callPackage ../development/python-modules/memcached { };
 
   memory_profiler = buildPythonPackage rec {
     name = "memory_profiler-${version}";