diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-03-11 00:43:18 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-03-11 00:43:18 +0000 |
commit | a6dea5a6f496ea38f56e3c3b4c5d628361cc029f (patch) | |
tree | 8300ad67b0135e6816ab38a6ac6f8fdaeccda2f0 /nixpkgs/pkgs/servers/monitoring | |
parent | 8779e0045c9f218caeb1dd1bcdc87e2715ed5be5 (diff) | |
parent | 5d3fd3674a66c5b1ada63e2eace140519849c967 (diff) | |
download | nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.gz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.bz2 nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.lz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.xz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.zst nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.zip |
Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'
Diffstat (limited to 'nixpkgs/pkgs/servers/monitoring')
-rw-r--r-- | nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/servers/monitoring/grafana/default.nix | 8 | ||||
-rw-r--r-- | nixpkgs/pkgs/servers/monitoring/plugins/default.nix | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix b/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix index ff0c926de595..58ef9fa32b91 100644 --- a/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ go ]; + GOCACHE="$TMPDIR/go-cache"; + buildPhase = '' mkdir -p Godeps/_workspace/src/github.com/google/ ln -s $(pwd) Godeps/_workspace/src/github.com/google/cadvisor diff --git a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 1d8f9ca3c799..721f4a043028 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -1,20 +1,22 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.4.3"; + version = "6.0.0"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; + excludedPackages = [ "release_publisher" ]; + src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "11fwb80a9qqlzmg11vw4llfa0mz80jkljg0gmp0sbv6c9jspqncv"; + sha256 = "1dacji3b8iqfx92cb6psrhvg2hym8xl1lzfn7yvyss4vjj7pmbbc"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "141msgrxdn4nmwp6jhh3zg5zcbj82pxdr7ysc5v28rh9paj79yyd"; + sha256 = "02c7klma5zl1mcis7gnbfi56i59ps7i757yyy8v9gnp5ynnb55v4"; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/monitoring/plugins/default.nix b/nixpkgs/pkgs/servers/monitoring/plugins/default.nix index a0f7341571ce..3e6eaa4766e8 100644 --- a/nixpkgs/pkgs/servers/monitoring/plugins/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/plugins/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook -, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl }: +, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl +, runtimeShell }: with stdenv.lib; @@ -50,7 +51,7 @@ in stdenv.mkDerivation rec { preBuild = '' mkdir -p $out cat <<_EOF > $out/share -#!${stdenv.shell} +#!${runtimeShell} exit 0 _EOF chmod 755 $out/share |