diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-08-25 16:53:05 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-08-25 16:53:05 +0000 |
| commit | b0849305d63df6cc0acfe199cec3a997ad3c5a75 (patch) | |
| tree | 6ff64291dec94a85c6e523a3f78da127a7daa1dd /pkgs/applications/system | |
| parent | c901f337b8fed63ba0bb53674950ce4c7bf94dcd (diff) | |
| parent | 7e07d142e78656c5f16b18d81ee4eb9444c9b93d (diff) | |
| download | nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.gz nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.bz2 nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.lz nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.xz nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.zst nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.zip | |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/applications/system')
| -rw-r--r-- | pkgs/applications/system/glances/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/system/monitor/default.nix | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 3dfec185b57..6b77914539c 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -1,21 +1,21 @@ { stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib , future, psutil, setuptools # Optional dependencies: -, bottle, batinfo, pysnmp +, bottle, pysnmp , hddtemp , netifaces # IP module }: buildPythonApplication rec { pname = "glances"; - version = "3.1.4.1"; + version = "3.1.5"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "04dc3pwj9qbbhxpihf13ckdgwz0qc771c7v7awni4vyzk3a9cdfb"; + sha256 = "0l91nvlwyabxlsy5p533dqnc68mmvykfsrcsnxylcpjjl1nzy931"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): @@ -35,7 +35,6 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - batinfo bottle future netifaces diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index ee1198c176f..30ae9e51e9e 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, nix-update-script , meson , ninja , vala @@ -18,13 +19,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.7.2"; + version = "0.8.1"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 ="1gd2i7gja4k9j4xac8jnls3v41d6qqhmqradz2jbsxwm2sk3cgcf"; + sha256 = "111g2f3y5lmz91m755jz0x8yx5cx9ym484gch8wcv80dmr7ilb1y"; fetchSubmodules = true; }; @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = pantheon.updateScript { + updateScript = nix-update-script { attrPath = pname; }; }; |