From a543d4236e626276b01dbdcc915c795d36d96bb6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:36:06 -0400 Subject: [PATCH] pythonPackages.livestreamer-curses: refactor move to python-modules --- .../livestreamer-curses/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/livestreamer-curses/default.nix 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";