diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-19 09:00:36 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-19 09:00:36 +0100 |
| commit | 9ab61ab8e2c5b7a40f2f0f8a044e6c8d15d10158 (patch) | |
| tree | ec26979beba499c597f55768464697f20729a96e /pkgs/servers/monitoring | |
| parent | db0211c6bc16827a7bcc23f807c6b3703b1452a5 (diff) | |
| parent | 911d1853ca990a7af6725105e7cda8c24cac025f (diff) | |
| download | nixlib-9ab61ab8e2c5b7a40f2f0f8a044e6c8d15d10158.tar nixlib-9ab61ab8e2c5b7a40f2f0f8a044e6c8d15d10158.tar.gz nixlib-9ab61ab8e2c5b7a40f2f0f8a044e6c8d15d10158.tar.bz2 nixlib-9ab61ab8e2c5b7a40f2f0f8a044e6c8d15d10158.tar.lz nixlib-9ab61ab8e2c5b7a40f2f0f8a044e6c8d15d10158.tar.xz nixlib-9ab61ab8e2c5b7a40f2f0f8a044e6c8d15d10158.tar.zst nixlib-9ab61ab8e2c5b7a40f2f0f8a044e6c8d15d10158.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/monitoring')
| -rw-r--r-- | pkgs/servers/monitoring/cadvisor/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index dd56bc89c0d0..ff0c926de595 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "0dnn2vgjbbb82kvbmgrfq0hqwfk0jh5gc3xrcfqwvvq673yf4f2m"; + sha256 = "1li2qgfi4lfa2i1m7ykjxy1xm9hlq42fgdkb2wh2db9chyg5r4qp"; }; nativeBuildInputs = [ go ]; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 2430a8cf1711..03080376ec2a 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -50,7 +50,7 @@ in rec { }; prometheus_2 = generic { - version = "2.4.3"; - sha256 = "1kci2zhh4ixil0b72d138vm8006y117mw51wsyz8j0gyy4180msj"; + version = "2.6.0"; + sha256 = "1d9zwzs280pw9zspqwp7xx3ji04lfg2v9l5qhrfy3y633ghcmpxz"; }; } |