about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Ostrouchov <chris.ostrouchov@gmail.com>2018-10-15 12:54:10 -0400
committerFrederik Rietdijk <fridh@fridh.nl>2018-10-17 07:46:55 +0200
commitac2ec2ecc1a821f4fc0030af4351aa30ee03d518 (patch)
tree9f174200c2132580d1d87a784ade547aa134e766
parent22a6d2be219bc8f64b40e2ef37ef2453c311baa7 (diff)
downloadnixlib-ac2ec2ecc1a821f4fc0030af4351aa30ee03d518.tar
nixlib-ac2ec2ecc1a821f4fc0030af4351aa30ee03d518.tar.gz
nixlib-ac2ec2ecc1a821f4fc0030af4351aa30ee03d518.tar.bz2
nixlib-ac2ec2ecc1a821f4fc0030af4351aa30ee03d518.tar.lz
nixlib-ac2ec2ecc1a821f4fc0030af4351aa30ee03d518.tar.xz
nixlib-ac2ec2ecc1a821f4fc0030af4351aa30ee03d518.tar.zst
nixlib-ac2ec2ecc1a821f4fc0030af4351aa30ee03d518.zip
pythonPackages.CDDB: refactor move to python-modules
-rw-r--r--pkgs/development/python-modules/cddb/default.nix24
-rw-r--r--pkgs/top-level/python-packages.nix19
2 files changed, 25 insertions, 18 deletions
diff --git a/pkgs/development/python-modules/cddb/default.nix b/pkgs/development/python-modules/cddb/default.nix
new file mode 100644
index 000000000000..f40ff08fcf42
--- /dev/null
+++ b/pkgs/development/python-modules/cddb/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, pkgs
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  name = "CDDB-1.4";
+  disabled = isPy3k;
+
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
+
+  src = pkgs.fetchurl {
+    url = "http://cddb-py.sourceforge.net/${name}.tar.gz";
+    sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://cddb-py.sourceforge.net/;
+    description = "CDDB and FreeDB audio CD track info access";
+    license = licenses.gpl2Plus;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5d5e5481694a..57bea81da688 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1272,24 +1272,7 @@ in {
 
   cccolutils = callPackage ../development/python-modules/cccolutils {};
 
-  CDDB = buildPythonPackage rec {
-    name = "CDDB-1.4";
-
-    disabled = !isPy27;
-
-    buildInputs = optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
-
-    src = pkgs.fetchurl {
-      url = "http://cddb-py.sourceforge.net/${name}.tar.gz";
-      sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w";
-    };
-
-    meta = {
-      homepage = http://cddb-py.sourceforge.net/;
-      description = "CDDB and FreeDB audio CD track info access";
-      license = licenses.gpl2Plus;
-    };
-  };
+  CDDB = callPackage ../development/python-modules/cddb { };
 
   cntk = buildPythonPackage rec {
     inherit (pkgs.cntk) name version src meta;