diff options
author | Domen Kožar <domen@dev.si> | 2015-08-29 14:04:43 +0200 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2015-08-29 14:04:43 +0200 |
commit | 806b679b6db4e3d6be13743a1aa91e79d132d9c9 (patch) | |
tree | cd2968622f2f969fc0b54d895564e32368fda7fb /pkgs/servers | |
parent | d9cb4f92b55e3576df6925eb8ac8808c65b0bdfe (diff) | |
parent | 86eca38b0c2e341a97e4ecab07d1ebd517bf1d05 (diff) | |
download | nixlib-806b679b6db4e3d6be13743a1aa91e79d132d9c9.tar nixlib-806b679b6db4e3d6be13743a1aa91e79d132d9c9.tar.gz nixlib-806b679b6db4e3d6be13743a1aa91e79d132d9c9.tar.bz2 nixlib-806b679b6db4e3d6be13743a1aa91e79d132d9c9.tar.lz nixlib-806b679b6db4e3d6be13743a1aa91e79d132d9c9.tar.xz nixlib-806b679b6db4e3d6be13743a1aa91e79d132d9c9.tar.zst nixlib-806b679b6db4e3d6be13743a1aa91e79d132d9c9.zip |
Merge pull request #9515 from benley/prometheus-0.15.1
Prometheus: update to 0.15.1
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/monitoring/prometheus/default.nix | 52 |
1 files changed, 23 insertions, 29 deletions
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 4b8d1cdbe56b..c6ed75e0d099 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,47 +2,41 @@ goPackages.buildGoPackage rec { name = "prometheus-${version}"; - version = "0.14.0"; + version = "0.15.1"; goPackagePath = "github.com/prometheus/prometheus"; - rev = "67e77411ba30b1b0ce0989c85b6684fb3adef430"; + rev = "64349aade284846cb194be184b1b180fca629a7c"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "06xsxigimw5i1fla0k83pf5bpmybskvy50433hs8h876gyvgjxp9"; + sha256 = "0gljpwnlip1fnmhbc96hji2rc56xncy97qccm7v1z5j1nhc5fam2"; }; - buildInputs = [ - goPackages.consul - goPackages.dns - goPackages.fsnotify.v1 - goPackages.goleveldb - goPackages.logrus - goPackages.net - goPackages.prometheus.client_golang - goPackages.prometheus.log - goPackages.yaml-v2 - vim # for xxd, used in embed-static.sh + buildInputs = with goPackages; [ + consul + dns + fsnotify.v1 + go-zookeeper + goleveldb + httprouter + logrus + net + prometheus.client_golang + prometheus.log + yaml-v2 ]; # Metadata that gets embedded into the binary - buildFlagsArray = '' + buildFlagsArray = let t = "${goPackagePath}/version"; in + '' -ldflags= - -X main.buildVersion ${version} - -X main.buildRevision ${builtins.substring 0 6 rev} - -X main.buildBranch master - -X main.buildUser nix@nixpkgs - -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion goPackages.go} - ''; - - preBuild = '' - ( - cd "go/src/$goPackagePath/web" - ${stdenv.shell} ../utility/embed-static.sh static templates \ - | gofmt > blob/files.go - ) + -X ${t}.Version=${version} + -X ${t}.Revision=${builtins.substring 0 6 rev} + -X ${t}.Branch=master + -X ${t}.BuildUser=nix@nixpkgs + -X ${t}.BuildDate=20150101-00:00:00 + -X ${t}.GoVersion=${lib.getVersion goPackages.go} ''; meta = with lib; { |