diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-08-22 21:22:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-22 21:22:38 +0200 |
| commit | 0436b987539b5447cadd1ea9c1eaea52b27a9be2 (patch) | |
| tree | 97edca9a302b03636fcee89fe4c0be6221ceddd7 /pkgs/servers/monitoring | |
| parent | 8f0350a213f1899815d7cbb698a90b9dd5183675 (diff) | |
| parent | 876396cac06d76bffe80a197551406fceca85fae (diff) | |
Merge pull request #95845 from WilliButz/update/prometheus-2.20.1
prometheus: 2.19.3 -> 2.20.1, fix thanos test
Diffstat (limited to 'pkgs/servers/monitoring')
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/webui-yarndeps.nix | 16 |
2 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 0b17f7801b68c..7e729cd366f3f 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,13 @@ -{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }: +{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }: let - version = "2.19.3"; + version = "2.20.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "0dlvhbxahdq0x0qa0gv1rc4y5dp6lx44w280rbm9279nv1nplffh"; + sha256 = "0svhx08pbz55nhn6g9pn79zbhyvr394k5w3ny1mq3wp382h62r5j"; }; webui = mkYarnPackage { @@ -61,6 +61,8 @@ in buildGoPackage rec { doCheck = true; + passthru.tests = { inherit (nixosTests) prometheus; }; + meta = with lib; { description = "Service monitoring system and time series database"; homepage = "https://prometheus.io"; diff --git a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 7e9843dc98b06..8b7d346e5600e 100644 --- a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -4122,11 +4122,11 @@ }; } { - name = "elliptic___elliptic_6.5.2.tgz"; + name = "elliptic___elliptic_6.5.3.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz"; - sha1 = "05c5678d7173c049d8ca433552224a495d0e3762"; + name = "elliptic___elliptic_6.5.3.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz"; + sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"; }; } { @@ -11698,11 +11698,11 @@ }; } { - name = "websocket_extensions___websocket_extensions_0.1.3.tgz"; + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; path = fetchurl { - name = "websocket_extensions___websocket_extensions_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz"; - sha1 = "5d2ff22977003ec687a4b87073dfbbac146ccf29"; + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; + sha1 = "7f8473bc839dfd87608adb95d7eb075211578a42"; }; } { |