diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-06 14:01:25 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-06 14:01:25 +0200 |
| commit | 38dc9a870f8b453635368dd284ec4363b67a691d (patch) | |
| tree | 4db547a9874ef6440b28ded38c14517b8bdfe9eb /pkgs/servers | |
| parent | 40e917d35d0c2227de46484213858eb3268aebb7 (diff) | |
| parent | 67651d80bc8baaf09ab91fec8ea423e09107ed8f (diff) | |
| download | nixlib-38dc9a870f8b453635368dd284ec4363b67a691d.tar nixlib-38dc9a870f8b453635368dd284ec4363b67a691d.tar.gz nixlib-38dc9a870f8b453635368dd284ec4363b67a691d.tar.bz2 nixlib-38dc9a870f8b453635368dd284ec4363b67a691d.tar.lz nixlib-38dc9a870f8b453635368dd284ec4363b67a691d.tar.xz nixlib-38dc9a870f8b453635368dd284ec4363b67a691d.tar.zst nixlib-38dc9a870f8b453635368dd284ec4363b67a691d.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/sonarr/default.nix | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 56d2f854654c..ccf5e7fea0a9 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.3.2"; + version = "4.4.3"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0hz323favjm0gz4s2112rl8ygw7dy2pz808yhraplq8nljqh4h11"; + sha256 = "04cm8h7if8yvczcwd83drbfzgr1spfspzg5im8lb540ks9x55dz4"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "0vk668ibayx0hqlam9jns5c7pggdh83yy54hnz5l7fnws4lm50qc"; + sha256 = "1p36hniay2y3mwg300b7n3sl3vv7l5jq5ddcnmpmznwyd8zwbl4h"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; @@ -28,8 +28,8 @@ buildGoPackage rec { meta = with lib; { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; license = licenses.asl20; - homepage = http://grafana.org/; - maintainers = with maintainers; [ offline fpletz ]; + homepage = https://grafana.org/; + maintainers = with maintainers; [ offline fpletz willibutz ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 20fb74924d3e..8fe4b8df1ab3 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4928"; + version = "2.0.0.4949"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "0wggh8z5dmkkcgbb1hzikia55djdqmbqz2dpzx1iyvgys7y5n8xm"; + sha256 = "7e4e3a3668ee7485d0ee4009bcd1f2a7c3e8c25da7d9170272ef275a19c76ac4"; }; buildInputs = [ |