From 2114c56b9062e13b19dbd53de1347a406948e81c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 26 Oct 2018 11:30:51 -0400 Subject: [PATCH] pythonPackages.pyscss: refactor move to python-modules --- .../python-modules/pyscss/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +------------ 2 files changed, 40 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/pyscss/default.nix diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix new file mode 100644 index 00000000000..cf63d3660ef --- /dev/null +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, pytest +, six +, enum34 +, pathlib +, ordereddict +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyScss"; + version = "1.3.5"; + + src = fetchFromGitHub { + sha256 = "0lfsan74vcw6dypb196gmbprvlbran8p7w6czy8hyl2b1l728mhz"; + rev = "v1.3.5"; + repo = "pyScss"; + owner = "Kronuz"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ six ] + ++ (stdenv.lib.optionals (pythonOlder "3.4") [ enum34 pathlib ]) + ++ (stdenv.lib.optionals (pythonOlder "2.7") [ ordereddict ]); + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "A Scss compiler for Python"; + homepage = http://pyscss.readthedocs.org/en/latest/; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 358b00a977b..86055285d4a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3481,33 +3481,7 @@ in { pyreadability = callPackage ../development/python-modules/pyreadability { }; - pyscss = buildPythonPackage rec { - name = "pyScss-${version}"; - version = "1.3.5"; - - src = pkgs.fetchFromGitHub { - sha256 = "0lfsan74vcw6dypb196gmbprvlbran8p7w6czy8hyl2b1l728mhz"; - rev = "v1.3.5"; - repo = "pyScss"; - owner = "Kronuz"; - }; - - checkInputs = with self; [ pytest ]; - - propagatedBuildInputs = with self; [ six ] - ++ (optionals (pythonOlder "3.4") [ enum34 pathlib ]) - ++ (optionals (pythonOlder "2.7") [ ordereddict ]); - - checkPhase = '' - py.test - ''; - - meta = { - description = "A Scss compiler for Python"; - homepage = http://pyscss.readthedocs.org/en/latest/; - license = licenses.mit; - }; - }; + pyscss = callPackage ../development/python-modules/pyscss { }; pyserial = callPackage ../development/python-modules/pyserial {};