diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 13:00:02 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 13:00:02 +0100 |
| commit | 089da3ee5c25f5d36d660d6c679cb0c963617fa7 (patch) | |
| tree | c21e0b5ec1b1daa2cb08d2a9fdb460aa13d10c7f /pkgs/servers | |
| parent | db32c7ca8bf7daad6792c3e9597c68768aafd271 (diff) | |
| parent | 393dcd9c84e104ab7ff7e35f5612dc221e58d29b (diff) | |
| download | nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.gz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.bz2 nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.lz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.xz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.zst nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.zip | |
Merge master into x-updates
Conflicts (simple): pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.2.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/memcached/default.nix | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index c91d6bbf761a..f6b31177157c 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -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] ++ diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 9e687e9c843a..2bbe9798de46 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -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] ++ diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 1c3c3f706e48..ef77c3191cab 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -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 ]; |