summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Ostrouchov <chris.ostrouchov@gmail.com>2018-10-17 14:36:06 -0400
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2018-10-18 11:02:23 +0200
commita543d4236e626276b01dbdcc915c795d36d96bb6 (patch)
tree5fc339c4efdef1931be7cf6e92675df6aba44777
parenta599dc127943a79256f05a5bfddf8ef60ab920f2 (diff)
downloadnixpkgs-a543d4236e626276b01dbdcc915c795d36d96bb6.tar
nixpkgs-a543d4236e626276b01dbdcc915c795d36d96bb6.tar.gz
nixpkgs-a543d4236e626276b01dbdcc915c795d36d96bb6.tar.bz2
nixpkgs-a543d4236e626276b01dbdcc915c795d36d96bb6.tar.lz
nixpkgs-a543d4236e626276b01dbdcc915c795d36d96bb6.tar.xz
nixpkgs-a543d4236e626276b01dbdcc915c795d36d96bb6.tar.zst
nixpkgs-a543d4236e626276b01dbdcc915c795d36d96bb6.zip
pythonPackages.livestreamer-curses: refactor move to python-modules
-rw-r--r--pkgs/development/python-modules/livestreamer-curses/default.nix26
-rw-r--r--pkgs/top-level/python-packages.nix19
2 files changed, 27 insertions, 18 deletions
diff --git a/pkgs/development/python-modules/livestreamer-curses/default.nix b/pkgs/development/python-modules/livestreamer-curses/default.nix
new file mode 100644
index 00000000000..bf3b2cc1164
--- /dev/null
+++ b/pkgs/development/python-modules/livestreamer-curses/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, isPyPy
+, livestreamer
+}:
+
+buildPythonPackage rec {
+  version = "1.5.2";
+  pname = "livestreamer-curses";
+  disabled = isPyPy;
+
+  src = fetchurl {
+    url = "https://github.com/gapato/livestreamer-curses/archive/v${version}.tar.gz";
+    sha256 = "1v49sym6mrci9dxy0a7cpbp4bv6fg2ijj6rwk4wzg18c2x4qzkhn";
+  };
+
+  propagatedBuildInputs = [ livestreamer ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/gapato/livestreamer-curses;
+    description = "Curses frontend for livestreamer";
+    license = licenses.mit;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b0def3b7f7a..9671c108133 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2974,24 +2974,7 @@ in {
 
   livestreamer = callPackage ../development/python-modules/livestreamer { };
 
-  livestreamer-curses = buildPythonPackage rec {
-    version = "1.5.2";
-    name = "livestreamer-curses-${version}";
-    disabled = isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/gapato/livestreamer-curses/archive/v${version}.tar.gz";
-      sha256 = "1v49sym6mrci9dxy0a7cpbp4bv6fg2ijj6rwk4wzg18c2x4qzkhn";
-    };
-
-    propagatedBuildInputs = with self; [ livestreamer ];
-
-    meta = {
-      homepage = https://github.com/gapato/livestreamer-curses;
-      description = "Curses frontend for livestreamer";
-      license = licenses.mit;
-    };
-  };
+  livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { };
 
   oauth = buildPythonPackage (rec {
     name = "oauth-1.0.1";