From 67140c410faab5dd713deea28dfd9a34ef2b2337 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Apr 2005 08:53:48 +0000
Subject: [PATCH] * Zlib updated to 1.2.2.

svn path=/nixpkgs/trunk/; revision=2517
---
 pkgs/development/libraries/zlib/darwin.patch | 22 --------------------
 pkgs/development/libraries/zlib/default.nix  |  7 +++----
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/development/libraries/zlib/darwin.patch

diff --git a/pkgs/development/libraries/zlib/darwin.patch b/pkgs/development/libraries/zlib/darwin.patch
deleted file mode 100644
index 7a0a6902de4..00000000000
--- a/pkgs/development/libraries/zlib/darwin.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -rc zlib-1.2.1/configure zlib-patched/configure
-*** zlib-1.2.1/configure	2003-11-17 04:50:39.000000000 +0100
---- zlib-patched/configure	2004-08-05 19:18:59.000000000 +0200
-***************
-*** 89,97 ****
-               SHAREDLIB=libz$shared_ext
-               SHAREDLIBV=libz.$VER$shared_ext
-               SHAREDLIBM=libz.$VER1$shared_ext
-!              LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name /usr/lib/$SHAREDLIBV -compatibility_version $VER2 -current_version $VER"}
-!              libdir='/usr/lib'
-!              includedir='/usr/include';;
-    *)             LDSHARED=${LDSHARED-"$cc -shared"};;
-    esac
-  else
---- 89,95 ----
-               SHAREDLIB=libz$shared_ext
-               SHAREDLIBV=libz.$VER$shared_ext
-               SHAREDLIBM=libz.$VER1$shared_ext
-!              LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name \${libdir}/$SHAREDLIBV -compatibility_version $VER2 -current_version $VER"};;
-    *)             LDSHARED=${LDSHARED-"$cc -shared"};;
-    esac
-  else
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 91cd2660c08..879deb88d56 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,11 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "zlib-1.2.1";
+  name = "zlib-1.2.2";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zlib-1.2.1.tar.gz;
-    md5 = "ef1cb003448b4a53517b8f25adb12452";
+    url = http://www.gzip.org/zlib/zlib-1.2.2.tar.gz;
+    md5 = "68bd51aaa6558c3bc3fd4890e53413de";
   };
   configureFlags = "--shared";
-  patches = [./darwin.patch];
 }