fuse3: 3.2.0 -> 3.2.1

NixOS · Nov 15, 2017 · f460037 · f460037
1 parent 73af2b2
commit f460037
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 28 deletions.
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
@@ -25,12 +25,7 @@ in stdenv.mkDerivation rec {
         url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
         sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";
       })
-    ++ stdenv.lib.optionals isFuse3 [
-      ./fuse3-no-udev.patch # only required for udevrulesdir
-      ./fuse3-install.patch
-      # install_man makes the build non-reproducible by encoding the date
-      ./fuse3-install_man.patch
-    ];
+    ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch;
 
 
   nativeBuildInputs = if isFuse3
@@ -40,6 +35,8 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common";
 
+  mesonFlags = stdenv.lib.optional isFuse3 "-Dudevrulesdir=etc/udev/rules.d";
+
   preConfigure = ''
     export MOUNT_FUSE_PATH=$out/sbin
     export INIT_D_PATH=$TMPDIR/etc/init.d

diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
@@ -13,8 +13,8 @@ in {
   };
 
   fuse_3 = mkFuse {
-    version = "3.2.0";
-    sha256Hash = "0bfpwkfamg4rcbq1s7v5rblpisqq73z6d5j3dxypgqll07hfg51x";
+    version = "3.2.1";
+    sha256Hash = "19bsvb5lc8k1i0h5ld109kixn6mdshzvg3y7820k9mnw34kh09y0";
     maintainers = [ maintainers.primeos ];
   };
 }
diff --git a/pkgs/os-specific/linux/fuse/fuse3-install_man.patch b/pkgs/os-specific/linux/fuse/fuse3-install_man.patch
diff --git a/pkgs/os-specific/linux/fuse/fuse3-no-udev.patch b/pkgs/os-specific/linux/fuse/fuse3-no-udev.patch