* davfs2 updated to 1.4.5. * neon updated to 0.28.6.

svn path=/nixpkgs/trunk/; revision=18841

+30 -29
+4 -4
pkgs/development/libraries/neon/0.28.nix
··· 9 9 assert sslSupport -> openssl != null; 10 10 assert static || shared; 11 11 12 - stdenv.mkDerivation { 13 - name = "neon-0.28.3"; 12 + stdenv.mkDerivation rec { 13 + name = "neon-0.28.6"; 14 14 15 15 src = fetchurl { 16 - url = http://www.webdav.org/neon/neon-0.28.3.tar.gz; 17 - sha256 = "1hnd9wlbnfpppx6rvalhdkc1rf29afacl1m15z751g3h9hdybplh"; 16 + url = "http://www.webdav.org/neon/${name}.tar.gz"; 17 + sha256 = "03ncisn1iziz79vw678wsrv8jf63m2szd2qml5baj53slcd8pvh6"; 18 18 }; 19 19 20 20 buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib;
pkgs/os-specific/linux/davfs2/davfs2-install.patch pkgs/tools/filesystems/davfs2/davfs2-install.patch
-20
pkgs/os-specific/linux/davfs2/default.nix
··· 1 - {stdenv, fetchurl, neon, zlib}: 2 - 3 - stdenv.mkDerivation rec { 4 - name = "davfs2-1.4.1"; 5 - 6 - src = fetchurl { 7 - url = "http://www.very-clever.com/download/nongnu/davfs2/${name}.tar.gz"; 8 - sha256 = "0fqq331rd3ylzfhdsbbj0b2znn3d0js0kxcv3w54dl9g2cs8fqhn"; 9 - }; 10 - 11 - buildInputs = [ neon zlib ]; 12 - patches = [ ./davfs2-install.patch ]; 13 - 14 - meta = { 15 - description = "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."; 16 - 17 - license = "GPLv3+"; 18 - homepage = http://savannah.nongnu.org/projects/davfs2; 19 - }; 20 - }
+21
pkgs/tools/filesystems/davfs2/default.nix
··· 1 + { stdenv, fetchurl, neon, zlib }: 2 + 3 + stdenv.mkDerivation rec { 4 + name = "davfs2-1.4.5"; 5 + 6 + src = fetchurl { 7 + url = "mirror://savannah/davfs2/${name}.tar.gz"; 8 + sha256 = "1pkl2braggp2qg4c68dwfv399l9jz7cvi7gkm4xbj6mgvl0cxw18"; 9 + }; 10 + 11 + buildInputs = [ neon zlib ]; 12 + 13 + patches = [ ./davfs2-install.patch ]; 14 + 15 + meta = { 16 + 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."; 17 + 18 + license = "GPLv3+"; 19 + homepage = http://savannah.nongnu.org/projects/davfs2; 20 + }; 21 + }
+5 -5
pkgs/top-level/all-packages.nix
··· 519 519 inherit fetchurl stdenv zlib bzip2 openssl; 520 520 }; 521 521 522 + davfs2 = import ../tools/filesystems/davfs2 { 523 + inherit fetchurl stdenv zlib; 524 + neon = neon028; 525 + }; 526 + 522 527 dcraw = import ../tools/graphics/dcraw { 523 528 inherit fetchurl stdenv gettext libjpeg lcms; 524 529 }; ··· 5198 5203 5199 5204 darwinSwVersUtility = import ../os-specific/darwin/sw_vers { 5200 5205 inherit stdenv; 5201 - }; 5202 - 5203 - davfs2 = import ../os-specific/linux/davfs2 { 5204 - inherit fetchurl stdenv zlib; 5205 - neon = neon028; 5206 5206 }; 5207 5207 5208 5208 devicemapper = import ../os-specific/linux/device-mapper {