diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-14 12:58:02 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-14 12:58:02 +0000 |
commit | ee0c3b4f1b1d034279881ecd32c3e80fda3d8788 (patch) | |
tree | 79cda200e54a81e3247bcf27a67c3cb95455f96d /pkgs | |
parent | dd03c2d78b6f75d40c05adc300716dfc9e2e21f5 (diff) | |
parent | c42f58233c1504d7834c6208b522954277c71918 (diff) | |
download | nixlib-ee0c3b4f1b1d034279881ecd32c3e80fda3d8788.tar nixlib-ee0c3b4f1b1d034279881ecd32c3e80fda3d8788.tar.gz nixlib-ee0c3b4f1b1d034279881ecd32c3e80fda3d8788.tar.bz2 nixlib-ee0c3b4f1b1d034279881ecd32c3e80fda3d8788.tar.lz nixlib-ee0c3b4f1b1d034279881ecd32c3e80fda3d8788.tar.xz nixlib-ee0c3b4f1b1d034279881ecd32c3e80fda3d8788.tar.zst nixlib-ee0c3b4f1b1d034279881ecd32c3e80fda3d8788.zip |
Merge pull request #73339 from marsam/update-prometheus
prometheus: 2.13.1 -> 2.14.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/monitoring/prometheus/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 86bd7f9d5189..9559c9b5c37f 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b02d3e29da8..fe2283525f9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |