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

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
This commit is contained in:
Eelco Dolstra
2014-07-28 11:30:49 +02:00
parent 3e4a382d67 30431e7160
commit f64d84698e
217 changed files with 2107 additions and 2941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/apache-httpd/2.4.nix
+2 -2
View File
@@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
stdenv.mkDerivation rec {
version = "2.4.9";
version = "2.4.10";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha256 = "00vnhki0rdwlhl4cjgvkq5vpf8szx2sdd3yi7bcg7jj7z86wk37p";
sha256 = "0slwcqw9f7fnb3kyz27hlsgh8j4wiza4yzqyp6vhfpvl3an4sv0p";
};
buildInputs = [perl] ++