From a9c403d38bb0087549cadec6d7151295ba1585d3 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Thu, 2 Jul 2015 17:56:26 -0700 Subject: [PATCH 1/2] prometheus-node-exporter: 0.8.1 -> 0.10.0 --- .../servers/monitoring/prometheus/node_exporter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix index c60985d3aa7..922c958b3f5 100644 --- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix @@ -4,22 +4,22 @@ with goPackages; buildGoPackage rec { name = "prometheus-node-exporter-${rev}"; - rev = "0.8.1"; + rev = "0.10.0"; goPackagePath = "github.com/prometheus/node_exporter"; src = fetchFromGitHub { owner = "prometheus"; repo = "node_exporter"; inherit rev; - sha256 = "15vp88w0b7h6sryy61qk369yjr3p4qvpch1nbxd9rm51bdgsqyys"; + sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p"; }; buildInputs = [ - glog go-runit ntp prometheus.client_golang prometheus.client_model + prometheus.log protobuf ]; From bcf990c7fdc9b13ee71356edc0e4bfe5a124953a Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Thu, 2 Jul 2015 18:09:22 -0700 Subject: [PATCH 2/2] prometheus-alertmanager: 0.0.1 -> 0.0.4 --- .../monitoring/prometheus/alertmanager/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix index 56fcee76278..f2f5eaa6f18 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix @@ -1,23 +1,23 @@ { stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: goPackages.buildGoPackage rec { - name = "prometheus-alertmanager-${version}"; - version = "0.0.1"; + name = "prometheus-alertmanager-${rev}"; + rev = "0.0.4"; goPackagePath = "github.com/prometheus/alertmanager"; src = fetchFromGitHub { owner = "prometheus"; repo = "alertmanager"; - rev = "2b6c5caf89a492b013204e8d7db99fbb78c5dcd4"; - sha256 = "13rdqnvmx11ks305dlnzv9gwf8c4zjyi5fkwcd69xgjfars2m4f3"; + inherit rev; + sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15"; }; buildInputs = [ - goPackages.glog goPackages.protobuf goPackages.fsnotify.v0 goPackages.httprouter goPackages.prometheus.client_golang + goPackages.prometheus.log goPackages.pushover protobuf vim @@ -25,7 +25,7 @@ goPackages.buildGoPackage rec { buildFlagsArray = '' -ldflags= - -X main.buildVersion ${version} + -X main.buildVersion ${rev} -X main.buildBranch master -X main.buildUser nix@nixpkgs -X main.buildDate 20150101-00:00:00