diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 09:40:37 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-23 09:40:37 -0400 |
commit | 18742471aff29270453a540f84d543137ee9d44e (patch) | |
tree | d21863fd81db3722e8cac52b52be3dd1c429cf21 /pkgs/servers | |
parent | 2e831da76da0a51557975a55dc8a18ebf3401bfb (diff) | |
parent | bbcaf78350d87c4657b1a2451132535467a454eb (diff) | |
download | nixlib-18742471aff29270453a540f84d543137ee9d44e.tar nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.gz nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.bz2 nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.lz nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.xz nixlib-18742471aff29270453a540f84d543137ee9d44e.tar.zst nixlib-18742471aff29270453a540f84d543137ee9d44e.zip |
Merge remote-tracking branch 'upstream/master' into staging
Use newer vagrant from master
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/mail/postfix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/slimserver/default.nix | 11 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/pg_repack/default.nix | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index a5168ebd4dfa..41dfebab7907 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "0fggpbsc9jkrbaw9hy0zw9h32plmfvcv0x860pbih0g346byhhkr"; + sha256 = "0fvymsklp32njsv0ngc1f45j01kcy61r5in99g5palibwkd19xal"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index f79e53b64cf4..c9bf8393afc7 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPerlPackage, fetchurl -, perl, perlPackages, fetchpatch }: +{ stdenv, buildPerlPackage, fetchurl, fetchpatch, makeWrapper +, perl, perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: buildPerlPackage rec { name = "slimserver-${version}"; @@ -16,6 +16,7 @@ buildPerlPackage rec { } ) ]; buildInputs = [ + makeWrapper perl perlPackages.AnyEvent perlPackages.AudioScan @@ -75,17 +76,19 @@ buildPerlPackage rec { preConfigurePhase = ""; - buildPhase = " + buildPhase = '' mv lib tmp mkdir -p lib/perl5/site_perl mv CPAN_used/* lib/perl5/site_perl cp -rf tmp/* lib/perl5/site_perl - "; + ''; doCheck = false; installPhase = '' cp -r . $out + wrapProgram $out/slimserver.pl \ + --prefix PATH : "${stdenv.lib.makeBinPath [ lame flac faad2 sox monkeysAudio wavpack ]}" ''; outputs = [ "out" ]; diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix index 50c9c68bb5f7..1b7cd08b082b 100644 --- a/pkgs/servers/sql/postgresql/pg_repack/default.nix +++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "pg_repack-${version}"; - version = "1.4.2"; + version = "1.4.3"; buildInputs = [ postgresql openssl zlib readline ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "reorg"; repo = "pg_repack"; rev = "refs/tags/ver_${version}"; - sha256 = "1yv5x7dgiv1miazbngkrkdbc2zpwklj6nlligghjvv83bcl8969q"; + sha256 = "1mmd22nfaxjwnbl3i95f3ivmjvfqwdflgaczlg3129dbpwg265xr"; }; installPhase = '' |