diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-11-19 11:25:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 11:25:21 +0100 |
| commit | f2201dbb5debc5c79067f4e0d75912019d2c6c1f (patch) | |
| tree | 0ea2bcc1d81f13259495f2e9bb0b9230cc9277a8 | |
| parent | 589d025f73e1559a53e6cb9626ea9a8f9697c7c7 (diff) | |
| parent | 20f3e3a02be1c76dfcf7b74527c669a8e56ecfea (diff) | |
Merge pull request #104213 from zowoq/prometheus
prometheus: 2.22.1 -> 2.22.2
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 445872bbe5fbe..6ab1c80ecedf5 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,13 @@ -{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }: +{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }: let - version = "2.22.1"; + version = "2.22.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "0wilx675b0a8ww7bj36hzcaip0zqzndkzan04rjsjigz5bw6kba0"; + sha256 = "04pf3shdfd25wf8snkan5hzv1gjzazjw06i11xaamnc8gfahnzdv"; }; webui = mkYarnPackage { @@ -59,7 +59,7 @@ in buildGoPackage rec { cp -a $src/console_libraries $src/consoles $out/etc/prometheus ''; - doCheck = true; + doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1 passthru.tests = { inherit (nixosTests) prometheus; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35bef78609d0f..8b1eb03c80086 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17296,10 +17296,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix { postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { - buildGoPackage = buildGo114Package; - go = go_1_14; - }; + prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; |