diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-03-07 22:08:27 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-03-07 22:08:27 +0100 |
| commit | e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd (patch) | |
| tree | 4f1e1a834fbbc0e201e0fb453801d005ed22d332 /pkgs/servers | |
| parent | baee91ec60ca724b00027033a8e0d7f97cf376a7 (diff) | |
| parent | bcfb3dd9c605bf68730757cc60d01dec91f009f2 (diff) | |
| download | nixpkgs-e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd.tar nixpkgs-e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd.tar.gz nixpkgs-e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd.tar.bz2 nixpkgs-e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd.tar.lz nixpkgs-e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd.tar.xz nixpkgs-e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd.tar.zst nixpkgs-e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd.zip | |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/tomcat/6.0.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/tomcat/7.0.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/tomcat/8.0.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/mail/archiveopteryx/default.nix | 12 |
4 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix index 71f1d62f4d8..c01e5065764 100644 --- a/pkgs/servers/http/tomcat/6.0.nix +++ b/pkgs/servers/http/tomcat/6.0.nix @@ -1,6 +1,6 @@ import ./recent.nix { versionMajor = "6"; - versionMinor = "0.44"; - sha256 = "0942f0ss6w9k23xg94nir2dbbkqrqp5k628jflk51ikm5qr95dxa"; + versionMinor = "0.45"; + sha256 = "0ba8h86padpk23xmscp7sg70g0v8ji2jbwwriz59hxqy5zhd76wg"; } diff --git a/pkgs/servers/http/tomcat/7.0.nix b/pkgs/servers/http/tomcat/7.0.nix index 221feb9c30e..b38f4353cc4 100644 --- a/pkgs/servers/http/tomcat/7.0.nix +++ b/pkgs/servers/http/tomcat/7.0.nix @@ -1,6 +1,6 @@ import ./recent.nix { versionMajor = "7"; - versionMinor = "0.62"; - sha256 = "0v8zvyd4h85ynnday58x0ppplw4flxyjsrmrpg78rrv3w49fm1x7"; + versionMinor = "0.68"; + sha256 = "1q5qgci5ia25zqa1k1n2xzarsgk1317ya89mfgg0fmi65x1046ic"; } diff --git a/pkgs/servers/http/tomcat/8.0.nix b/pkgs/servers/http/tomcat/8.0.nix index a6da1198c9a..00460179667 100644 --- a/pkgs/servers/http/tomcat/8.0.nix +++ b/pkgs/servers/http/tomcat/8.0.nix @@ -1,6 +1,6 @@ import ./recent.nix { versionMajor = "8"; - versionMinor = "0.23"; - sha256 = "0f0s35iqs1zpifya0qvdrk55r77jr074sc0zk5cjivxaxnhik2y9"; + versionMinor = "0.32"; + sha256 = "1f59x5z8qf4rzy49m8d5ifi4h1ghkz5r33l3i67sib414h7jc8vy"; } diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 966f90c40f1..bb2ab16ae66 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -11,12 +11,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ jam ]; buildInputs = [ openssl perl zlib ]; - preConfigure = ''export PREFIX="$out" ''; + preConfigure = '' + export INSTALLROOT=installroot + sed -i 's:BINDIR = $(PREFIX)/bin:BINDIR = '$out'/bin:' ./Jamsettings + sed -i 's:SBINDIR = $(PREFIX)/sbin:SBINDIR = '$out'/bin:' ./Jamsettings + sed -i 's:LIBDIR = $(PREFIX)/lib:LIBDIR = '$out'/lib:' ./Jamsettings + sed -i 's:MANDIR = $(PREFIX)/man:MANDIR = '$out'/share/man:' ./Jamsettings + sed -i 's:READMEDIR = $(PREFIX):READMEDIR = '$out'/share/doc/archiveopteryx:' ./Jamsettings + ''; buildPhase = ''jam "-j$NIX_BUILD_CORES" ''; installPhase = '' jam install - mkdir -p "$out/share/doc/archiveopteryx" - mv -t "$out/share/doc/archiveopteryx/" "$out"/{bsd.txt,COPYING,README} + mv installroot/$out $out ''; meta = with stdenv.lib; { |