diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2019-04-08 18:03:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 18:03:25 +0200 |
| commit | 65fa918adbdd7ec41bd4b35e9c659728e282d593 (patch) | |
| tree | 6b86b085f0c17ea57b0a940d04e4a56e79617674 | |
| parent | folly: 2019.01.28.00 -> 2019.03.18.00 (#58673) (diff) | |
| parent | prometheus: rename the generic function to buildPrometheus (diff) | |
| download | nixpkgs-65fa918adbdd7ec41bd4b35e9c659728e282d593.tar.gz | |
Merge pull request #59175 from jbgi/generic-prometheus
Expose prometheus generic builder.
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 03080376ec2a..b9acb142cfff 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,8 +2,8 @@ let goPackagePath = "github.com/prometheus/prometheus"; - - generic = { version, sha256, ... }@attrs: +in rec { + buildPrometheus = { version, sha256, doCheck ? true, ... }@attrs: let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in buildGoPackage ({ name = "prometheus-${version}"; @@ -17,8 +17,6 @@ let inherit sha256; }; - doCheck = true; - buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' -ldflags= -X ${t}.Version=${version} @@ -43,13 +41,13 @@ let platforms = platforms.unix; }; } // attrs'); -in rec { - prometheus_1 = generic { + + prometheus_1 = buildPrometheus { version = "1.8.2"; sha256 = "088flpg3qgnj9afl9vbaa19v2s1d21yxy38nrlv5m7cxwy2pi5pv"; }; - prometheus_2 = generic { + prometheus_2 = buildPrometheus { version = "2.6.0"; sha256 = "1d9zwzs280pw9zspqwp7xx3ji04lfg2v9l5qhrfy3y633ghcmpxz"; }; |