From 5d62a4d1819dc7f702cf2380ef8eb8b2427a292c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 28 Aug 2017 09:47:38 +0100 Subject: [PATCH] python.pkgs.cgroup-utils: fix build --- .../python-modules/cgroup-utils/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +--------------- 2 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/cgroup-utils/default.nix diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix new file mode 100644 index 00000000000..ed0623fa778 --- /dev/null +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pep8, nose }: + +buildPythonPackage rec { + version = "0.6"; + name = "cgroup-utils-${version}"; + + buildInputs = [ pep8 nose ]; + # Pep8 tests fail... + doCheck = false; + + postPatch = '' + sed -i -e "/argparse/d" setup.py + ''; + + src = fetchFromGitHub { + owner = "peo3"; + repo = "cgroup-utils"; + rev = "v${version}"; + sha256 = "1ck0aijzrg9xf6hjdxnynkapnyxw0y385jb0q7wyq4jf77ayfszc"; + }; + + meta = with stdenv.lib; { + description = "Utility tools for control groups of Linux"; + maintainers = with maintainers; [ layus ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f2cf42e6fc1..e22b56dd7fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1656,28 +1656,7 @@ in { }; }; - cgroup-utils = buildPythonPackage rec { - version = "0.6"; - name = "cgroup-utils-${version}"; - - propagatedBuildInputs = with self; [ argparse ]; - buildInputs = with self; [ pep8 nose ]; - # Pep8 tests fail... - doCheck = false; - - src = pkgs.fetchFromGitHub { - owner = "peo3"; - repo = "cgroup-utils"; - rev = "v${version}"; - sha256 = "1ck0aijzrg9xf6hjdxnynkapnyxw0y385jb0q7wyq4jf77ayfszc"; - }; - - meta = { - description = "Utility tools for control groups of Linux"; - maintainers = with maintainers; [ layus ]; - license = licenses.gpl2; - }; - }; + cgroup-utils = callPackage ../development/python-modules/cgroup-utils {}; channels = callPackage ../development/python-modules/channels {};