MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glances: move from python-module to application

Browse source
This commit is contained in:
Jonathan Ringer 2020-02-27 08:23:32 -08:00 committed by Jon
parent a0a724938e
commit cad99590a2
4 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/development/python-modules/glances/default.nix → pkgs/applications/system/glances/default.nix
View file

@ -1,13 +1,12 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, isPyPy, lib
, psutil, setuptools, bottle, batinfo, pysnmp
, hddtemp, future
{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib
, future, psutil, setuptools
# Optional dependencies:
, bottle, batinfo, pysnmp
, hddtemp
, netifaces # IP module
# Tests:
, unittest2
}:
buildPythonPackage rec {
buildPythonApplication rec {
pname = "glances";
version = "3.1.3";
disabled = isPyPy;
@ -44,13 +43,18 @@ buildPythonPackage rec {
];
doCheck = true;
checkInputs = [ unittest2 ];
preCheck = lib.optional stdenv.isDarwin ''
export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks
'';
propagatedBuildInputs = [ psutil setuptools bottle batinfo pysnmp future
propagatedBuildInputs = [
batinfo
bottle
future
netifaces
psutil
pysnmp
setuptools
] ++ lib.optional stdenv.isLinux hddtemp;
preConfigure = ''
@ -58,10 +62,9 @@ buildPythonPackage rec {
'';
meta = with lib; {
homepage = https://nicolargo.github.io/glances/;
homepage = "https://nicolargo.github.io/glances/";
description = "Cross-platform curses-based monitoring tool";
license = licenses.lgpl3;
maintainers = with maintainers; [ primeos koral ];
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ jonringer primeos koral ];
};
}

0
pkgs/development/python-modules/glances/skip-failing-tests.patch → pkgs/applications/system/glances/skip-failing-tests.patch
View file

2
pkgs/top-level/all-packages.nix
View file

@ -929,6 +929,8 @@ in
gjs = callPackage ../development/libraries/gjs { };
glances = python3Packages.callPackage ../applications/system/glances { };
glasgow = with python3Packages; toPythonApplication glasgow;
gucci = callPackage ../tools/text/gucci { };

2
pkgs/top-level/python-packages.nix
View file

@ -3724,7 +3724,7 @@ in {
git-sweep = callPackage ../development/python-modules/git-sweep { };
glances = callPackage ../development/python-modules/glances { };
glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
github3_py = callPackage ../development/python-modules/github3_py { };