diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-03-30 08:14:35 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-03-30 08:14:35 +0200 |
| commit | 9d2ff985718b9c04e51fefb1867f82fa0246db0f (patch) | |
| tree | 3d2aeafe69428756af5a18d8bba8d2b41f5af142 /pkgs/servers | |
| parent | 01fb1af4f507a2249668d664575717d84b6c1d89 (diff) | |
| parent | a7af5d4f88f9e30bc9b401a84b7cb3cf036fccbb (diff) | |
| download | nixpkgs-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar nixpkgs-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.gz nixpkgs-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.bz2 nixpkgs-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.lz nixpkgs-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.xz nixpkgs-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.zst nixpkgs-9d2ff985718b9c04e51fefb1867f82fa0246db0f.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/mail/dovecot/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/sql/mysql/5.7.x.nix | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 0060a59d807..c9065d04161 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.0.1"; + name = "dovecot-2.3.1"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "0lzisrdgrj5qqwjb7bv99mf2aljm568r6g108yisp0s644z2nxxb"; + sha256 = "14zva4f8k64x86sm9n21cp2yvrpph6k6k52bm22a00pxjwdq50q8"; }; preConfigure = '' diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 92b404d0f65..af9ff3b257b 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dovecot-pigeonhole-${version}"; - version = "0.5.0.1"; + version = "0.5.1"; src = fetchurl { url = "http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; - sha256 = "1lpsdqh9pwqx917z5v23bahhhbrcb3y5ps3l413sli8cn4a6sdan"; + sha256 = "0ivmaxic6cygfphvlrvy0xgggydm7j7kjv1ssfqbr08q4rcsmc73"; }; buildInputs = [ dovecot openssl ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 61ff67ed993..d2a0d046389 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 = "5.0.3"; + version = "5.0.4"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0508dvkanrfrvdnddjsaz8qm3qbgavznia5hqr8zx3qvq4789hj2"; + sha256 = "18f69985a5j6fd2ax6z50yfss70phdh1vwyx0z69j145zac3sf90"; }; srcStatic = fetchurl { url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "0dzb93vx72sm6iri6c96k3a15zn8mp26pd2r78m6k3nhg8rsrqmm"; + sha256 = "0xdpqf8n3ds0g7nhbiwahhdj0hfc4biz69rhkl48vm31idlr92sc"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index b6b1dc7b127..15e8569fd09 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -60,7 +60,7 @@ self = stdenv.mkDerivation rec { install -vD $out/lib/*.a -t $static/lib rm -r $out/mysql-test rm $out/share/man/man1/mysql-test-run.pl.1 $out/lib/*.a - ln -s libmysqlclient.so $out/lib/libmysqlclient_r.so + ln -s libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libmysqlclient_r${stdenv.hostPlatform.extensions.sharedLibrary} ''; passthru = { |