From b6fdd1a0fcd2cadb0c84e793d00c798d62168f05 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 8 Apr 2019 16:40:42 +0200 Subject: [PATCH] prometheus: rename the generic function to buildPrometheus Since the `generic` function is now exported it should have a less generic name, pun intended. --- pkgs/servers/monitoring/prometheus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index b2e6ffc5996..b9acb142cff 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -3,7 +3,7 @@ let goPackagePath = "github.com/prometheus/prometheus"; in rec { - generic = { version, sha256, doCheck ? true, ... }@attrs: + buildPrometheus = { version, sha256, doCheck ? true, ... }@attrs: let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in buildGoPackage ({ name = "prometheus-${version}"; @@ -42,12 +42,12 @@ in rec { }; } // attrs'); - prometheus_1 = generic { + prometheus_1 = buildPrometheus { version = "1.8.2"; sha256 = "088flpg3qgnj9afl9vbaa19v2s1d21yxy38nrlv5m7cxwy2pi5pv"; }; - prometheus_2 = generic { + prometheus_2 = buildPrometheus { version = "2.6.0"; sha256 = "1d9zwzs280pw9zspqwp7xx3ji04lfg2v9l5qhrfy3y633ghcmpxz"; };