diff options
Diffstat (limited to 'pkgs/servers/monitoring')
-rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/monitoring/loki/default.nix | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 787c7b1d463..183bbc73f5d 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.5.2"; + version = "6.5.3"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1hplnb8rv2sxai05qf6il5kza08bkhcawvymr2h9lfdsj7p4kbzy"; + sha256 = "1ks951b3ar1wdpbxn8ak74m8zh02d3lbmk6mphwni68c019ymahi"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1fnj41lp9b53iyjgis5x8k3g5vl73fdrxsdxnf10d4ma95cwb2qa"; + sha256 = "1gjj0h7kz4lan00ka5kg901l3nyzswnjfr0slqy08bl4svqpizh2"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 895621d4cba..b5e63a3aed4 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: buildGoPackage rec { - version = "1.2.0"; + version = "1.3.0"; pname = "grafana-loki"; goPackagePath = "github.com/grafana/loki"; @@ -11,9 +11,15 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "04ix58gb9yy5jf8fhn3k1pbwqs69k7m96cck38ymhwml1793b4k9"; + sha256 = "0b1dpb3vh5i18467qk8kpb5ic14p4p1dfyr8hjkznf6bs7g8ka1q"; }; + postPatch = '' + substituteInPlace pkg/distributor/distributor_test.go --replace \ + '"eth0", "en0", "lo0"' \ + '"lo"' + ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ]; |