Update fuse and make wdfs build with the latest neon. neon026 does not build with the current
SSL. We should either remove neon026 or fix it. svn path=/nixpkgs/trunk/; revision=23505
This commit is contained in:
parent
d5f6f72342
commit
66004ecba7
@ -1,13 +1,13 @@
|
|||||||
{ stdenv, fetchurl, utillinux }:
|
{ stdenv, fetchurl, utillinux }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "fuse-2.8.3";
|
name = "fuse-2.8.4";
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/fuse/${name}.tar.gz";
|
url = "mirror://sourceforge/fuse/${name}.tar.gz";
|
||||||
sha256 = "5edf7f73676976126893c528578c1bf0a264cc34ca8bad7e341e0664157ff2b9";
|
sha256 = "076y4n9ppmqlfarvm219694cn78qms7k2vh1b4454kkcgg9jmrh4";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = "--disable-kernel-module";
|
configureFlags = "--disable-kernel-module";
|
||||||
|
@ -1264,9 +1264,7 @@ let
|
|||||||
tomcat = tomcat6;
|
tomcat = tomcat6;
|
||||||
};
|
};
|
||||||
|
|
||||||
wdfs = callPackage ../tools/filesystems/wdfs {
|
wdfs = callPackage ../tools/filesystems/wdfs { };
|
||||||
neon = neon026;
|
|
||||||
};
|
|
||||||
|
|
||||||
wdiff = callPackage ../tools/text/wdiff { };
|
wdiff = callPackage ../tools/text/wdiff { };
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user