From a108b8617b78aa1a96504f08940a7667928378b1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 29 Sep 2018 11:36:59 +0200 Subject: [PATCH] pythonPackages.glances: 3.0.1 -> 3.0.2 --- .../python-modules/glances/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +--------------- 2 files changed, 36 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/glances/default.nix diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix new file mode 100644 index 000000000000..3b0f61c36238 --- /dev/null +++ b/pkgs/development/python-modules/glances/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage, fetchFromGitHub, isPyPy, lib +, psutil, setuptools, bottle, batinfo, pysnmp +, hddtemp +, unittest2 +}: + +buildPythonPackage rec { + name = "glances-${version}"; + version = "3.0.2"; + disabled = isPyPy; + + src = fetchFromGitHub { + owner = "nicolargo"; + repo = "glances"; + rev = "v${version}"; + sha256 = "1jkjblfk4gbr00j7lny7ajiizzqnp0p1yhzfi14074gwk38z0q14"; + }; + + # Requires access to /sys/class/power_supply + doCheck = false; + + buildInputs = [ unittest2 ]; + propagatedBuildInputs = [ psutil setuptools bottle batinfo pysnmp hddtemp ]; + + preConfigure = '' + sed -i 's/data_files\.append((conf_path/data_files.append(("etc\/glances"/' setup.py; + ''; + + meta = with lib; { + homepage = https://nicolargo.github.io/glances/; + description = "Cross-platform curses-based monitoring tool"; + license = licenses.lgpl3; + maintainers = with maintainers; [ primeos koral ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bb512c0bd619..b3fe62baf0a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5828,35 +5828,7 @@ in { }; }; - glances = buildPythonPackage rec { - name = "glances-${version}"; - version = "3.0.1"; - disabled = isPyPy; - - src = pkgs.fetchFromGitHub { - owner = "nicolargo"; - repo = "glances"; - rev = "v${version}"; - sha256 = "18pyp6ij3bzybqj771v48n7yn3a1spk6ncg1kgp6hfpjhpqiw87x"; - }; - - # Requires access to /sys/class/power_supply - doCheck = false; - - buildInputs = with self; [ unittest2 ]; - propagatedBuildInputs = with self; [ psutil setuptools bottle batinfo pkgs.hddtemp pysnmp ]; - - preConfigure = '' - sed -i 's/data_files\.append((conf_path/data_files.append(("etc\/glances"/' setup.py; - ''; - - meta = { - homepage = https://nicolargo.github.io/glances/; - description = "Cross-platform curses-based monitoring tool"; - license = licenses.lgpl3; - maintainers = with maintainers; [ primeos koral ]; - }; - }; + glances = callPackage ../development/python-modules/glances { }; github3_py = buildPythonPackage rec { name = "github3.py-${version}";