Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'

git-subtree-dir: nixpkgs
git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a
git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199

3 files changed, 110 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch b/nixpkgs/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch
new file mode 100644
index 000000000000..87222a9c0ce0
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch
@@ -0,0 +1,12 @@
+diff -Nuar neon-0.29.6/configure neon-0.29.6-darwin-fix-configure/configure
+--- neon-0.29.6/configure	2011-05-03 14:25:31.000000000 +0200
++++ neon-0.29.6-darwin-fix-configure/configure	2012-06-06 23:32:21.000000000 +0200
+@@ -4184,7 +4184,7 @@
+ $as_echo "$ne_cv_os_uname" >&6; }
+ 
+ if test "$ne_cv_os_uname" = "Darwin"; then
+-  CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
++  CPPFLAGS="$CPPFLAGS"
+   LDFLAGS="$LDFLAGS -flat_namespace"
+   # poll has various issues in various Darwin releases
+   if test x${ac_cv_func_poll+set} != xset; then
diff --git a/nixpkgs/pkgs/development/libraries/neon/0.29.nix b/nixpkgs/pkgs/development/libraries/neon/0.29.nix
new file mode 100644
index 000000000000..87f9b5effacd
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/neon/0.29.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, libxml2, pkgconfig, perl
+, compressionSupport ? true, zlib ? null
+, sslSupport ? true, openssl ? null
+, static ? false
+, shared ? true
+}:
+
+assert compressionSupport -> zlib != null;
+assert sslSupport -> openssl != null;
+assert static || shared;
+
+let
+   inherit (stdenv.lib) optionals;
+in
+
+stdenv.mkDerivation rec {
+  version = "0.29.6";
+  name = "neon-${version}";
+
+  src = fetchurl {
+    url = "http://www.webdav.org/neon/${name}.tar.gz";
+    sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w";
+  };
+
+  patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [libxml2 openssl]
+    ++ stdenv.lib.optional compressionSupport zlib;
+
+  configureFlags = [
+    (stdenv.lib.enableFeature shared "shared")
+    (stdenv.lib.enableFeature static "static")
+    (stdenv.lib.withFeature compressionSupport "zlib")
+    (stdenv.lib.withFeature sslSupport "ssl")
+  ];
+
+  passthru = {inherit compressionSupport sslSupport;};
+
+  checkInputs = [ perl ];
+  doCheck = false; # fails, needs the net
+
+  meta = with stdenv.lib; {
+    description = "An HTTP and WebDAV client library";
+    homepage = http://www.webdav.org/neon/;
+    platforms = platforms.unix;
+    license = licenses.lgpl2;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/neon/default.nix b/nixpkgs/pkgs/development/libraries/neon/default.nix
new file mode 100644
index 000000000000..61a40753a56f
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/neon/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, libxml2, pkgconfig, perl
+, compressionSupport ? true, zlib ? null
+, sslSupport ? true, openssl ? null
+, static ? false
+, shared ? true
+}:
+
+assert compressionSupport -> zlib != null;
+assert sslSupport -> openssl != null;
+assert static || shared;
+
+let
+   inherit (stdenv.lib) optionals;
+in
+
+stdenv.mkDerivation rec {
+  version = "0.30.2";
+  name = "neon-${version}";
+
+  src = fetchurl {
+    url = "http://www.webdav.org/neon/${name}.tar.gz";
+    sha256 = "1jpvczcx658vimqm7c8my2q41fnmjaf1j03g7bsli6rjxk6xh2yv";
+  };
+
+  patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [libxml2 openssl]
+    ++ stdenv.lib.optional compressionSupport zlib;
+
+  configureFlags = [
+    (stdenv.lib.enableFeature shared "shared")
+    (stdenv.lib.enableFeature static "static")
+    (stdenv.lib.withFeature compressionSupport "zlib")
+    (stdenv.lib.withFeature sslSupport "ssl")
+  ];
+
+  passthru = {inherit compressionSupport sslSupport;};
+
+  checkInputs = [ perl ];
+  doCheck = false; # fails, needs the net
+
+  meta = with stdenv.lib; {
+    description = "An HTTP and WebDAV client library";
+    homepage = http://www.webdav.org/neon/;
+    platforms = platforms.unix;
+    license = licenses.lgpl2;
+  };
+}