diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2018-07-12 17:14:03 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2018-07-13 16:43:21 +0200 |
| commit | fa6941f1086bae9f1f747e974af2a289143fac31 (patch) | |
| tree | 5c88b91a0f25c9f8168b4fb88a55c6915f339f5e /pkgs/os-specific/linux/fuse | |
| parent | c4d94d64c306939786410c8a7e9637da26712ee7 (diff) | |
fuse3: 3.2.3 -> 3.2.4
Diffstat (limited to 'pkgs/os-specific/linux/fuse')
| -rw-r--r-- | pkgs/os-specific/linux/fuse/common.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/fuse/default.nix | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 04a4a1a0e1f1d..d813258f95a9e 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -53,22 +53,18 @@ in stdenv.mkDerivation rec { # The configure phase will delete these files (temporary workaround for # ./fuse3-install_man.patch) install -D -m444 doc/fusermount3.1 $out/share/man/man1/fusermount3.1 - install -D -m444 doc/mount.fuse.8 $out/share/man/man8/mount.fuse.8 + install -D -m444 doc/mount.fuse3.8 $out/share/man/man8/mount.fuse3.8 '' else '' sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh ./makeconf.sh ''); postFixup = "cd $out\n" + (if isFuse3 then '' - mv bin/mount.fuse3 bin/mount.fuse - install -D -m444 etc/fuse.conf $common/etc/fuse.conf install -D -m444 etc/udev/rules.d/99-fuse3.rules $common/etc/udev/rules.d/99-fuse.rules - install -D -m444 share/man/man8/mount.fuse.8.gz $common/share/man/man8/mount.fuse.8.gz '' else '' cp ${fusePackages.fuse_3.common}/etc/fuse.conf etc/fuse.conf cp ${fusePackages.fuse_3.common}/etc/udev/rules.d/99-fuse.rules etc/udev/rules.d/99-fuse.rules - cp ${fusePackages.fuse_3.common}/share/man/man8/mount.fuse.8.gz share/man/man8/mount.fuse.8.gz ''); enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index f308930f0dc51..cdbcca55d2ff2 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.2.3"; - sha256Hash = "185p1vjcsyzpcdkrcyw06zpapv4jc43qw9i8a4amzpgk1rsgg19d"; + version = "3.2.4"; + sha256Hash = "1ybgd4s7naiyvaris7j6fzp604cgi5mgrn715x8l4kn5k9d840im"; }; } |