From b7151c4e2c64146bc325b6a4ee6c13241c9ae51b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 28 Apr 2010 08:40:19 +0000
Subject: [PATCH] Add neon-0.29.x, make it default

Also stop using "default" neon in all-packages.nix.
Minor versions are not source-compatible, so a package should state needed version explicitly.

svn path=/nixpkgs/trunk/; revision=21394
---
 pkgs/development/libraries/neon/0.29.nix | 37 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          | 19 ++++++++----
 2 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/neon/0.29.nix

diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix
new file mode 100644
index 000000000000..df952a253155
--- /dev/null
+++ b/pkgs/development/libraries/neon/0.29.nix
@@ -0,0 +1,37 @@
+{ 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.29.3";
+
+  src = fetchurl {
+    url = "http://www.webdav.org/neon/${name}.tar.gz";
+    sha256 = "1d1c6zhr00yvg0fbhpkq8kmsq9cchr112ii9rl39gdybyflh9444";
+  };
+
+  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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11f706307783..603e980afc3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1636,7 +1636,8 @@ let
   };
 
   sitecopy = import ../tools/networking/sitecopy {
-    inherit fetchurl stdenv neon openssl;
+    inherit fetchurl stdenv openssl;
+    neon = neon026;
   };
 
   privoxy = import ../tools/networking/privoxy {
@@ -1792,7 +1793,8 @@ let
   };
 
   wdfs = import ../tools/filesystems/wdfs {
-    inherit stdenv fetchurl neon fuse pkgconfig glib;
+    inherit stdenv fetchurl fuse pkgconfig glib;
+    neon = neon026;
   };
 
   wdiff = import ../tools/text/wdiff {
@@ -4714,7 +4716,7 @@ let
     unicode = (system != "i686-cygwin" && crossSystem == null);
   };
 
-  neon = neon026;
+  neon = neon029;
 
   neon026 = import ../development/libraries/neon/0.26.nix {
     inherit fetchurl stdenv libxml2 zlib openssl pkgconfig;
@@ -4728,6 +4730,12 @@ let
     sslSupport = true;
   };
 
+  neon029 = import ../development/libraries/neon/0.29.nix {
+    inherit fetchurl stdenv libxml2 zlib openssl pkgconfig;
+    compressionSupport = true;
+    sslSupport = true;
+  };
+
   nethack = builderDefsPackage (import ../games/nethack) {
     inherit ncurses flex bison;
   };
@@ -7890,12 +7898,13 @@ let
   openoffice = import ../applications/office/openoffice {
     inherit fetchurl stdenv pam python tcsh libxslt perl zlib libjpeg
       expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron
-      curl libsndfile flex zip unzip libmspack getopt file neon cairo
+      curl libsndfile flex zip unzip libmspack getopt file cairo
       which icu jdk ant cups openssl bison boost gperf cppunit;
     inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
     inherit (gtkLibs) gtk;
     inherit (perlPackages) ArchiveZip CompressZlib;
     inherit (gnome) GConf ORBit2;
+    neon = neon026;
   };
 
   opera = import ../applications/networking/browsers/opera {
@@ -8130,7 +8139,7 @@ let
 
   subversion = makeOverridable (import ../applications/version-management/subversion/default.nix) {
     inherit (pkgsOverriden) fetchurl stdenv apr aprutil expat swig zlib jdk python perl sqlite;
-    neon = neon028;
+    neon = neon029;
     bdbSupport = getConfig ["subversion" "bdbSupport"] true;
     httpServer = getConfig ["subversion" "httpServer"] false;
     httpSupport = getConfig ["subversion" "httpSupport"] true;