git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #104213 from zowoq/prometheus

prometheus: 2.22.1 -> 2.22.2

commitf2201dbb5debc5c79067f4e0d75912019d2c6c1f authorMaximilian Bosch <maximilian@mbosch.me> dateThu 19 Nov 2020, 11:25 (6 years ago) parent589d02520f3e3a
2 files changed+5−8
pkgs/servers/monitoring/prometheus/default.nix+4−4 pkgs/top-level/all-packages.nix+1−4
pkgs/servers/monitoring/prometheus/default.nix+4−4
@@ -1,13 +1,13 @@
1−{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }:
1+{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }:
22
33let
4− version = "2.22.1";
4+ version = "2.22.2";
55
66 src = fetchFromGitHub {
77 rev = "v${version}";
88 owner = "prometheus";
99 repo = "prometheus";
10− sha256 = "0wilx675b0a8ww7bj36hzcaip0zqzndkzan04rjsjigz5bw6kba0";
10+ sha256 = "04pf3shdfd25wf8snkan5hzv1gjzazjw06i11xaamnc8gfahnzdv";
1111 };
1212
1313 webui = mkYarnPackage {
@@ -59,7 +59,7 @@ in buildGoPackage rec {
5959 cp -a $src/console_libraries $src/consoles $out/etc/prometheus
6060 '';
6161
62− doCheck = true;
62+ doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1
6363
6464 passthru.tests = { inherit (nixosTests) prometheus; };
6565
pkgs/top-level/all-packages.nix+1−4
@@ -17296,10 +17296,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
1729617296 postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
1729717297
1729817298 prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
17299− prometheus = callPackage ../servers/monitoring/prometheus {
17300− buildGoPackage = buildGo114Package;
17301− go = go_1_14;
17302− };
17299+ prometheus = callPackage ../servers/monitoring/prometheus { };
1730317300 prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
1730417301 prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { };
1730517302 prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { };