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

Merge master into x-updates

Browse Source 
Conflicts (simple):
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát
2013-12-10 13:00:02 +01:00
parent db32c7ca8b 393dcd9c84
commit 089da3ee5c
64 changed files with 558 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/http/apache-httpd/2.2.nix
View File

@@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert mpm == "prefork" || mpm == "worker" || mpm == "event";
stdenv.mkDerivation rec {
version = "2.2.25";
version = "2.2.26";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha1 = "e34222d1a8de38825397a1c70949bcc5836a1236";
sha256 = "1dj29cl2bsk8ir8hxw0ajhbpbrrmsh8mwqfc1ipiqgv7slyqx45g";
};
buildInputs = [perl apr aprutil pcre] ++

4
pkgs/servers/http/apache-httpd/2.4.nix
View File

@@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
stdenv.mkDerivation rec {
version = "2.4.6";
version = "2.4.7";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha1 = "16d8ec72535ded65d035122b0d944b0e64eaa2a2";
sha256 = "06z7ij0avr8f3rvp6ifk3dn8j73i17cn4avz4fp1as43061qsdk4";
};
buildInputs = [perl] ++

1
pkgs/servers/memcached/default.nix
View File

@@ -12,6 +12,7 @@ stdenv.mkDerivation {
meta = {
description = "A distributed memory object caching system";
repositories.git = https://github.com/memcached/memcached.git;
homepage = http://memcached.org/;
license = "bsd";
maintainers = [ stdenv.lib.maintainers.coconnor ];