Author: NicolasPierron
Date: Sun Apr 17 08:27:29 2011
New Revision: 26865
URL: https://svn.nixos.org/websvn/nix/?rev=26865&sc=1
Log:
davfs2:
- Use previous version of neon library.
- Add patch to find ISDIR macros.
Added:
nixpkgs/trunk/pkgs/tools/filesystems/davfs2/isdir.patch
Modified:
nixpkgs/trunk/pkgs/tools/filesystems/davfs2/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/filesystems/davfs2/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/filesystems/davfs2/default.nix Sun Apr 17
08:27:22 2011 (r26864)
+++ nixpkgs/trunk/pkgs/tools/filesystems/davfs2/default.nix Sun Apr 17
08:27:29 2011 (r26865)
@@ -10,7 +10,7 @@
buildInputs = [ neon zlib ];
- patches = [ ./davfs2-install.patch ];
+ patches = [ ./davfs2-install.patch ./isdir.patch ];
meta = {
longDescription = "Web Distributed Authoring and Versioning (WebDAV), an
extension to the HTTP-protocol, allows authoring of resources on a remote web
server. davfs2 provides the ability to access such resources like a typical
filesystem, allowing for use by standard applications with no built-in support
for WebDAV.";
Added: nixpkgs/trunk/pkgs/tools/filesystems/davfs2/isdir.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/filesystems/davfs2/isdir.patch Sun Apr 17
08:27:29 2011 (r26865)
@@ -0,0 +1,30 @@
+diff -ur davfs2-1.4.5-old/src/dav_coda.c davfs2-1.4.5-new/src/dav_coda.c
+--- davfs2-1.4.5-old/src/dav_coda.c 2009-06-04 20:30:32.000000000 +0200
++++ davfs2-1.4.5-new/src/dav_coda.c 2011-02-09 19:51:22.260530572 +0100
+@@ -52,6 +52,10 @@
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
++#ifdef HAVE_SYS_STAT_H
++#include <sys/stat.h>
++#endif
++
+
+ #include "defaults.h"
+ #include "mount_davfs.h"
+diff -ur davfs2-1.4.5-old/src/dav_fuse.c davfs2-1.4.5-new/src/dav_fuse.c
+--- davfs2-1.4.5-old/src/dav_fuse.c 2009-06-30 20:06:44.000000000 +0200
++++ davfs2-1.4.5-new/src/dav_fuse.c 2011-02-09 19:52:23.938220524 +0100
+@@ -41,6 +41,12 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_STAT_H
++#include <sys/stat.h>
++#endif
+
+ #include "defaults.h"
+ #include "mount_davfs.h"
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Apr 17 08:27:22
2011 (r26864)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Apr 17 08:27:29
2011 (r26865)
@@ -529,7 +529,7 @@
dar = callPackage ../tools/archivers/dar { };
davfs2 = callPackage ../tools/filesystems/davfs2 {
- neon = neon028;
+ neon = neon029;
};
dcraw = callPackage ../tools/graphics/dcraw { };
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
