summary refs log tree commit diff
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2017-10-29 14:37:00 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2017-10-29 22:35:15 +0100
commit95f29282fb57060adc8f7083ad0b4e3348ddf643 (patch)
tree2febbb9ee6f0392d8d21a1704bcac3d573cad889
parent0bc9f75dc16442abab86abcbab67dfe885378f95 (diff)
downloadnixlib-95f29282fb57060adc8f7083ad0b4e3348ddf643.tar
nixlib-95f29282fb57060adc8f7083ad0b4e3348ddf643.tar.gz
nixlib-95f29282fb57060adc8f7083ad0b4e3348ddf643.tar.bz2
nixlib-95f29282fb57060adc8f7083ad0b4e3348ddf643.tar.lz
nixlib-95f29282fb57060adc8f7083ad0b4e3348ddf643.tar.xz
nixlib-95f29282fb57060adc8f7083ad0b4e3348ddf643.tar.zst
nixlib-95f29282fb57060adc8f7083ad0b4e3348ddf643.zip
pythonPackages.pycollada: move to python-modules/
-rw-r--r--pkgs/development/python-modules/pycollada/default.nix24
-rw-r--r--pkgs/top-level/python-packages.nix23
2 files changed, 25 insertions, 22 deletions
diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix
new file mode 100644
index 000000000000..fec32b86aaf3
--- /dev/null
+++ b/pkgs/development/python-modules/pycollada/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, buildPythonPackage, numpy, isPy3k, dateutil, dateutil_1_5 }:
+
+buildPythonPackage rec {
+  name = "pycollada-0.4.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pycollada/${name}.tar.gz";
+    sha256 = "0i50lh98550pwr95zgzrgiqzsspm09wl52xlv83y5nrsz4mblylv";
+  };
+
+  buildInputs = [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]);
+
+  # Some tests fail because they refer to test data files that don't exist
+  # (upstream packaging issue)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python library for reading and writing collada documents";
+    homepage = http://pycollada.github.io/;
+    license = "BSD"; # they don't specify which BSD variant
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 472f84c274de..bfaae8485a38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3643,28 +3643,7 @@ in {
 
   cffi = callPackage ../development/python-modules/cffi { };
 
-  pycollada = buildPythonPackage rec {
-    name = "pycollada-0.4.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pycollada/${name}.tar.gz";
-      sha256 = "0i50lh98550pwr95zgzrgiqzsspm09wl52xlv83y5nrsz4mblylv";
-    };
-
-    buildInputs = with self; [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]);
-
-    # Some tests fail because they refer to test data files that don't exist
-    # (upstream packaging issue)
-    doCheck = false;
-
-    meta = {
-      description = "Python library for reading and writing collada documents";
-      homepage = http://pycollada.github.io/;
-      license = "BSD"; # they don't specify which BSD variant
-      platforms = with platforms; linux ++ darwin;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  pycollada = callPackage ../development/python-modules/pycollada { };
 
   pycontracts = buildPythonPackage rec {
     version = "1.7.9";