From 95935e65c1441676ee59ba8d9ed3bde9bc2f48fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Feb 2013 12:03:18 +0100
Subject: [PATCH] neon: remove obsolete versions 0.26 and 0.28

---
 pkgs/development/libraries/neon/0.26.nix      | 33 -----------------
 pkgs/development/libraries/neon/0.28.nix      | 37 -------------------
 .../libraries/neon/{0.29.nix => default.nix}  |  0
 pkgs/top-level/all-packages.nix               | 14 +------
 4 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 pkgs/development/libraries/neon/0.26.nix
 delete mode 100644 pkgs/development/libraries/neon/0.28.nix
 rename pkgs/development/libraries/neon/{0.29.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/neon/0.26.nix b/pkgs/development/libraries/neon/0.26.nix
deleted file mode 100644
index 6b06e54e73d6..000000000000
--- a/pkgs/development/libraries/neon/0.26.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, libxml2, pkgconfig
-, compressionSupport ? true, zlib ? null
-, sslSupport ? true, openssl ? null
-}:
-
-assert compressionSupport -> zlib != null;
-assert sslSupport -> openssl != null;
-
-stdenv.mkDerivation {
-  name = "neon-0.26.4";
-  
-  src = fetchurl {
-    url = http://www.webdav.org/neon/neon-0.26.4.tar.gz;
-    sha256 = "1pjrn5wb18gy419293hmwd02blmh36aaxsrgajm9nkkkjzqakncj";
-  };
-   
-  buildInputs = [libxml2]
-    ++ stdenv.lib.optional compressionSupport zlib
-    ++ (if sslSupport then [ openssl pkgconfig ] else []);
-
-  configureFlags = ''
-    ${if compressionSupport then "--with-zlib" else "--without-zlib"}
-    ${if sslSupport then "--with-ssl" else "--without-ssl"}
-    --enable-shared
-  '';
-
-  passthru = {inherit compressionSupport sslSupport;};
-
-  meta = {
-    description = "An HTTP and WebDAV client library";
-    homepage = http://www.webdav.org/neon/;
-  };
-}
diff --git a/pkgs/development/libraries/neon/0.28.nix b/pkgs/development/libraries/neon/0.28.nix
deleted file mode 100644
index 8e717ff52d82..000000000000
--- a/pkgs/development/libraries/neon/0.28.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, libxml2, pkgconfig
-, compressionSupport ? true, zlib ? null
-, sslSupport ? true, openssl ? null
-, static ? false
-, shared ? true
-}:
-
-assert compressionSupport -> zlib != null;
-assert sslSupport -> openssl != null;
-assert static || shared;
-
-stdenv.mkDerivation rec {
-  name = "neon-0.28.6";
-
-  src = fetchurl {
-    url = "http://www.webdav.org/neon/${name}.tar.gz";
-    sha256 = "03ncisn1iziz79vw678wsrv8jf63m2szd2qml5baj53slcd8pvh6";
-  };
-
-  buildInputs = [libxml2 pkgconfig openssl]
-    ++ stdenv.lib.optional compressionSupport zlib;
-
-  configureFlags = ''
-    ${if shared then "--enable-shared" else "--disable-shared"}
-    ${if static then "--enable-static" else "--disable-static"}
-    ${if compressionSupport then "--with-zlib" else "--without-zlib"}
-    ${if sslSupport then "--with-ssl" else "--without-ssl"}
-    --enable-shared
-  '';
-
-  passthru = {inherit compressionSupport sslSupport;};
-
-  meta = {
-    description = "An HTTP and WebDAV client library";
-    homepage = http://www.webdav.org/neon/;
-  };
-}
diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/default.nix
similarity index 100%
rename from pkgs/development/libraries/neon/0.29.nix
rename to pkgs/development/libraries/neon/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f13221d4afea..4786e4e1345d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4678,19 +4678,7 @@ let
       else stdenv;
   };
 
-  neon = neon029;
-
-  neon026 = callPackage ../development/libraries/neon/0.26.nix {
-    compressionSupport = true;
-    sslSupport = true;
-  };
-
-  neon028 = callPackage ../development/libraries/neon/0.28.nix {
-    compressionSupport = true;
-    sslSupport = true;
-  };
-
-  neon029 = callPackage ../development/libraries/neon/0.29.nix {
+  neon = callPackage ../development/libraries/neon {
     compressionSupport = true;
     sslSupport = true;
   };