about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Ostrouchov <chris.ostrouchov@gmail.com>2018-10-15 17:02:51 -0400
committerFrederik Rietdijk <fridh@fridh.nl>2018-10-17 07:46:56 +0200
commit67550913a43bdb2060a2d660498d65c03af36b37 (patch)
tree4bc7e471aa838b5b639c93ae81d8159fdd3f9e03
parent599b9045bae6deac0683610bf8f0bad86dd1ac1b (diff)
downloadnixlib-67550913a43bdb2060a2d660498d65c03af36b37.tar
nixlib-67550913a43bdb2060a2d660498d65c03af36b37.tar.gz
nixlib-67550913a43bdb2060a2d660498d65c03af36b37.tar.bz2
nixlib-67550913a43bdb2060a2d660498d65c03af36b37.tar.lz
nixlib-67550913a43bdb2060a2d660498d65c03af36b37.tar.xz
nixlib-67550913a43bdb2060a2d660498d65c03af36b37.tar.zst
nixlib-67550913a43bdb2060a2d660498d65c03af36b37.zip
pythonPackages.libcloud: refactor move to python-modules
-rw-r--r--pkgs/development/python-modules/libcloud/default.nix31
-rw-r--r--pkgs/top-level/python-packages.nix22
2 files changed, 32 insertions, 21 deletions
diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix
new file mode 100644
index 000000000000..90688d8e4ea2
--- /dev/null
+++ b/pkgs/development/python-modules/libcloud/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, mock
+, pycrypto
+}:
+
+buildPythonPackage rec {
+  pname = "apache-libcloud";
+  version = "1.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qlhyz5f32xg8i10biyzqscks8d28vklk63hvj45vzy1amw60kqz";
+  };
+
+  buildInputs = [ mock ];
+  propagatedBuildInputs = [ pycrypto ];
+
+  preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py";
+
+  # failing tests for 26 and 27
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A unified interface to many cloud providers";
+    homepage = http://incubator.apache.org/libcloud/;
+    license = licenses.asl20;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 80bb7a51a907..244d534f6c33 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5688,27 +5688,7 @@ in {
 
   python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { };
 
-  libcloud = buildPythonPackage (rec {
-    name = "libcloud-1.2.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/apache-libcloud/apache-${name}.tar.bz2";
-      sha256 = "0qlhyz5f32xg8i10biyzqscks8d28vklk63hvj45vzy1amw60kqz";
-    };
-
-    buildInputs = with self; [ mock ];
-
-    propagatedBuildInputs = with self; [ pycrypto ];
-    preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py";
-
-    # failing tests for 26 and 27
-    doCheck = false;
-
-    meta = {
-      description = "A unified interface to many cloud providers";
-      homepage = http://incubator.apache.org/libcloud/;
-    };
-  });
+  libcloud = callPackage ../development/python-modules/libcloud { };
 
   libgpuarray = callPackage ../development/python-modules/libgpuarray {
     clblas = pkgs.clblas.override { boost = self.boost; };