From 8ec3ec72263e69f39039cab13359a64fb8eba63d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 19 Nov 2020 07:45:18 +1000 Subject: [PATCH] Revert "prometheus: pin to go 1.14" This reverts commit ba17782524508c5e4f8af646bfeb7553185d4a6e. Fixed in https://github.com/prometheus/prometheus/releases/tag/v2.21.0 --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ae76b9242d..384502f2111 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17291,10 +17291,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 { };