mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Code Issues Wiki Activity

Merge pull request #73339 from marsam/update-prometheus

Browse source 
prometheus: 2.13.1 -> 2.14.0
This commit is contained in:
Franz Pletz 2019-11-14 12:58:02 +00:00 committed by GitHub
parent dd03c2d78b c42f58233c
commit ee0c3b4f1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/servers/monitoring/prometheus/default.nix
View file

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "prometheus";
version = "2.13.1";
version = "2.14.0";
goPackagePath = "github.com/prometheus/prometheus";
@ -10,7 +10,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "prometheus";
repo = "prometheus";
sha256 = "055qliv683b87dwj7pkprdpjgyp6s4s3cwvpbsl1gxidhlr4y69b";
sha256 = "0zmxj78h3cnqbhsqab940hyzpim5i9r81b15a57f3dnrrd10p287";
};
buildFlagsArray = let
@ -31,6 +31,12 @@ buildGoPackage rec {
cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
'';
# Disable module-mode, because Go 1.13 automatically enables it if there is
# go.mod file. Remove after https://github.com/NixOS/nixpkgs/pull/73380
preCheck = ''
export GO111MODULE=off
'';
doCheck = true;
meta = with lib; {

6
pkgs/top-level/all-packages.nix
View file

@ -15420,11 +15420,7 @@ in
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
prometheus = callPackage ../servers/monitoring/prometheus {
# Version 2.12.0 fails to build with go 1.13 due to an incorrect module file
# compilation error :go: cloud.google.com/go@v0.44.1: Get https://proxy.golang.org/cloud.google.com/go/@v/v0.44.1.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:58980->[::1]:53: read: connection refused
buildGoPackage = buildGo112Package;
};
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 { };