Merging from trunk. I had to give away some structure to build the native

sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045

1 files changed, 3 insertions, 3 deletions

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 57bf30c6649..c9b87ebb7d2 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -1,11 +1,11 @@
 args:
 with args;
 stdenv.mkDerivation {
-  name = "cyrus-sasl-2.1.22";
+  name = "cyrus-sasl-2.1.23";
 
   src = fetchurl {
-    url = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.22.tar.gz;
-    sha256 = "c69e3853f35b14ee2c3f6e876e42d880927258ff4678aa052e5f0853db209962";
+    url = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.23.tar.gz;
+    sha256 = "0dmi41hfy015pzks8n93qsshgvi0az7pv81nls4nxayb810crvr0";
   };
   configureFlags="--with-openssl=${openssl} --with-plugindir=\${out}/lib/sasl2 --with-configdir=\${out}/lib/sasl2";
   buildInputs = [ openssl db4 gettext ];