JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #104213 from zowoq/prometheus

Browse Source 
prometheus: 2.22.1 -> 2.22.2
This commit is contained in:
Maximilian Bosch 2020-11-19 11:25:21 +01:00 committed by GitHub
commit f2201dbb5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/monitoring/prometheus/default.nix
View File

@ -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; };

5
pkgs/top-level/all-packages.nix
View File

@ -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 { };