about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2009-12-08 11:38:34 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2009-12-08 11:38:34 +0000
commit83ee756b0acfb8ae74d6bbf528811382535aa99e (patch)
tree9ee8a3e7c2ab260ca8e0b79eb0a6c23d5e0c015a
parentebeacec489e56b36ce87525a72c96fc55c7c22c2 (diff)
* Latest FUSE and sshfs.
svn path=/nixpkgs/trunk/; revision=18839
-rw-r--r--pkgs/os-specific/linux/fuse/default.nix12
-rw-r--r--pkgs/tools/filesystems/sshfs-fuse/default.nix12
2 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index fc3bcf5a9d266..cbf09e704b2ce 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -1,18 +1,18 @@
-args: with args;
+{ stdenv, fetchurl, utillinux }:
 
-stdenv.mkDerivation {
-  name = "fuse-2.7.4";
+stdenv.mkDerivation rec {
+  name = "fuse-2.8.1";
   
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = mirror://sourceforge/fuse/fuse-2.7.4.tar.gz;
-    sha256 = "1rj9xn6ynbcqp6n5pf54jcyq13viij0jhv7adv89pq6lwpn71c68";
+    url = "mirror://sourceforge/fuse/${name}.tar.gz";
+    sha256 = "1brfgm2yxy060i6kcdlg30g2d48r6v9nhyxbfscpr6ijrrb10zq0";
   };
   
   configureFlags = "--disable-kernel-module";
   
-  buildInputs = [utillinux];
+  buildInputs = [ utillinux ];
   
   inherit utillinux;
 
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 5138ad2b022d5..74a367e852250 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, pkgconfig, glib, fuse}:
+{ stdenv, fetchurl, pkgconfig, glib, fuse }:
 
-stdenv.mkDerivation {
-  name = "sshfs-fuse-2.1";
+stdenv.mkDerivation rec {
+  name = "sshfs-fuse-2.2";
   
   src = fetchurl {
-    url = mirror://sourceforge/fuse/sshfs-fuse-2.1.tar.gz;
-    sha256 = "0cyjq8dwrv3rhj7a52sd3fmljh5fdphlsnvqx51v6hbgd3jgld0j";
+    url = "mirror://sourceforge/fuse/${name}.tar.gz";
+    sha256 = "08sl7q8nqwg57bxbzp2wb9h204gnl1w9c1f7zjdh7xdr9jybqvi0";
   };
   
-  buildInputs = [pkgconfig glib fuse];
+  buildInputs = [ pkgconfig glib fuse ];
 
   meta = {
     homepage = http://fuse.sourceforge.net/sshfs.html;