diff options
author | Benjamin Staffin <ben@folsomlabs.com> | 2015-03-21 16:31:18 -0700 |
---|---|---|
committer | Benjamin Staffin <ben@folsomlabs.com> | 2015-03-23 12:07:21 -0700 |
commit | 95be71cf91fbde933781a1c731dc2564c323644d (patch) | |
tree | 0703dfd672e1a1c41357bac6ecc5a8bc03cbe769 /pkgs | |
parent | 5b3254a8d155c555f758a04aa6546219f22ffa80 (diff) | |
download | nixlib-95be71cf91fbde933781a1c731dc2564c323644d.tar nixlib-95be71cf91fbde933781a1c731dc2564c323644d.tar.gz nixlib-95be71cf91fbde933781a1c731dc2564c323644d.tar.bz2 nixlib-95be71cf91fbde933781a1c731dc2564c323644d.tar.lz nixlib-95be71cf91fbde933781a1c731dc2564c323644d.tar.xz nixlib-95be71cf91fbde933781a1c731dc2564c323644d.tar.zst nixlib-95be71cf91fbde933781a1c731dc2564c323644d.zip |
Prometheus: update to 0.12.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/monitoring/prometheus/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/go-packages.nix | 34 |
2 files changed, 33 insertions, 7 deletions
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 4c05a859f017..6e181c6ec9e4 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -4,15 +4,15 @@ with goPackages; buildGoPackage rec { name = "prometheus-${version}"; - version = "0.10.0"; + version = "0.12.0"; goPackagePath = "github.com/prometheus/prometheus"; - rev = "f5a0f7fa185dae2c772a5847a7aac9ba33b545f9"; + rev = "55dcb55498b43bafe94915a4de7907d6d66b4427"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "1wagmr4bca8fbvi48n9p4hdnx1m4chyaa1bzman6dhqfmkiikf5q"; + sha256 = "17bbdk9axr91m2947ddbnzqwaap2vrzsbknbrlpdsmlsjhc8h7cb"; }; buildInputs = [ diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 53c9d2d70681..42917a99c06d 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -268,6 +268,18 @@ let self = _self // overrides; _self = with self; { buildInputs = [ sets go-simplejson check-v1 ]; }; + goautoneg = buildGoPackage rec { + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + name = "goautoneg-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "bitbucket.org/ww/goautoneg"; + + src = fetchhg { + inherit rev; + url = "https://${goPackagePath}"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + }; + gocheck = buildGoPackage rec { rev = "87"; name = "gocheck-${rev}"; @@ -880,6 +892,18 @@ let self = _self // overrides; _self = with self; { }; }; + beorn7.perks = buildGoPackage rec { + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + name = "beorn7.perks-${stdenv.lib.strings.substring 0 7 rev}"; + goPackagePath = "github.com/beorn7/perks"; + src = fetchFromGitHub { + inherit rev; + owner = "beorn7"; + repo = "perks"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + }; + pflag = buildGoPackage rec { date = "20131112"; rev = "94e98a55fb412fcbcfc302555cb990f5e1590627"; @@ -907,20 +931,22 @@ let self = _self // overrides; _self = with self; { }; prometheus.client_golang = buildGoPackage rec { - rev = "4627d59e8a09c330c5ccfe7414baca28d8df847d"; - name = "prometheus-client-${stdenv.lib.strings.substring 0 7 rev}"; + name = "prometheus-client-${version}"; + version = "0.3.2"; goPackagePath = "github.com/prometheus/client_golang"; src = fetchFromGitHub { - inherit rev; owner = "prometheus"; repo = "client_golang"; - sha256 = "1mmj1r8xfi1gwb5f0l6sxjj804dhavp3pjmrqpbaa1g82bmz1hr1"; + rev = "${version}"; + sha256 = "1fn56zp420hxpm0prr76yyhh62zq3sqj3ppl2r4qxjc78f8ckbj4"; }; propagatedBuildInputs = [ protobuf golang_protobuf_extensions prometheus.client_model prometheus.procfs + beorn7.perks + goautoneg ]; }; |