public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-05-02 22:58:02 +00:00
parent 0fdde5efd0 94520a25ad
commit c92bca56f8
867 changed files with 75282 additions and 27025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/apache-httpd/2.4.nix
+4 -4
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv
, proxySupport ? true
, sslSupport ? true, openssl
, http2Support ? true, libnghttp2
, http2Support ? true, nghttp2
, ldapSupport ? true, openldap
, libxml2Support ? true, libxml2
, luaSupport ? false, lua5
@@ -13,7 +13,7 @@ in
assert sslSupport -> aprutil.sslSupport && openssl != null;
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert http2Support -> libnghttp2 != null;
assert http2Support -> nghttp2 != null;
stdenv.mkDerivation rec {
version = "2.4.18";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
optional sslSupport openssl ++
optional ldapSupport openldap ++ # there is no --with-ldap flag
optional libxml2Support libxml2 ++
optional http2Support libnghttp2 ++
optional http2Support nghttp2 ++
optional stdenv.isDarwin libiconv;
patchPhase = ''
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
--enable-cgi
${optionalString proxySupport "--enable-proxy"}
${optionalString sslSupport "--enable-ssl"}
${optionalString http2Support "--enable-http2 --with-nghttp2=${libnghttp2}"}
${optionalString http2Support "--enable-http2 --with-nghttp2"}
${optionalString luaSupport "--enable-lua --with-lua=${lua5}"}
${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"}
--docdir=$(doc)/share/doc
pkgs/servers/http/nix-binary-cache/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
--replace @shell@ "${stdenv.shell}" \
--replace @coreutils@ "${coreutils}/bin" \
--replace @findutils@ "${findutils}/bin" \
--replace @nix@ "${nix}/bin" \
--replace @nix@ "${nix.out}/bin" \
--replace @xz@ "${xz.bin}/bin" \
--replace @bzip2@ "${bzip2.bin}/bin" \
--replace @gnused@ "${gnused}/bin" \
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
--replace @shell@ "${stdenv.shell}" \
--replace @coreutils@ "${coreutils}/bin" \
--replace @findutils@ "${findutils}/bin" \
--replace @nix@ "${nix}/bin" \
--replace @nix@ "${nix.out}/bin" \
--replace @xz@ "${xz.bin}/bin" \
--replace @bzip2@ "${bzip2.bin}/bin" \
--replace @gnused@ "${gnused}/bin" \