diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-06-08 15:41:39 +0000 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-06-08 15:41:39 +0000 |
| commit | 7db886fdb96067a43d72bca30a2802ceb534fc69 (patch) | |
| tree | 376006f8f4920103aac394501d7f2682250d3da8 /pkgs/servers | |
| parent | ba6c764a519a2dbe61b0a99a95df0d8bcd8a81fa (diff) | |
| parent | 8c4a613f3a478c1cb2994fb9df3b0eb92d4c7885 (diff) | |
| download | nixlib-7db886fdb96067a43d72bca30a2802ceb534fc69.tar nixlib-7db886fdb96067a43d72bca30a2802ceb534fc69.tar.gz nixlib-7db886fdb96067a43d72bca30a2802ceb534fc69.tar.bz2 nixlib-7db886fdb96067a43d72bca30a2802ceb534fc69.tar.lz nixlib-7db886fdb96067a43d72bca30a2802ceb534fc69.tar.xz nixlib-7db886fdb96067a43d72bca30a2802ceb534fc69.tar.zst nixlib-7db886fdb96067a43d72bca30a2802ceb534fc69.zip | |
Merge remote-tracking branch 'hydra/master' into x-updates
Conflicts (taken from @7c6f434c): pkgs/development/libraries/libgphoto2/default.nix
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/dns/bind/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/apache-modules/mod_evasive/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/xmpp/pyMAILt/default.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index d9a9b6b24322..1df30e254918 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, openssl, libtool, perl, libxml2 }: -let version = "9.9.2-P2"; in +let version = "9.9.3-P1"; in stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "1lk5npyr6bkm4gs2m90k4s8lmlcpfdphzqhi2hjnj2amwcs2g0pz"; + sha256 = "0ddlvdxsyibm24v1wzbknywvalsrvl06gbvsrigpqc1vgkj25ahv"; }; patchPhase = '' diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix index 22e0fabf832c..d796d0a6dc5e 100644 --- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix +++ b/pkgs/servers/http/apache-modules/mod_evasive/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, apacheHttpd }: stdenv.mkDerivation { - name = "mod_evasive_1.10.1"; + name = "mod_evasive-1.10.1"; src = fetchurl { url = http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz; diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index e763d2dce5b1..9e3877735d6f 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -33,7 +33,7 @@ rec { chmod a+rx $out/bin/pyMAILt $out/share/${name}/mail.py '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; - name = "pyMAILt"; + name = "pyMAILt-20090101"; meta = { description = "Email transport module for XMPP"; }; |