summary refs log tree commit diff
path: root/pkgs/os-specific/linux/fuse
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2020-10-10 12:51:49 +0200
committerGitHub <noreply@github.com>2020-10-10 12:51:49 +0200
commit33473c422cf26ebc1833aa0628a24245a968230c (patch)
tree26a9b5021a80070b053cf85313c9a31494fa049a /pkgs/os-specific/linux/fuse
parent967a01f20688ccfaf2b429f8d2b35d21c598edb3 (diff)
downloadnixpkgs-33473c422cf26ebc1833aa0628a24245a968230c.tar
nixpkgs-33473c422cf26ebc1833aa0628a24245a968230c.tar.gz
nixpkgs-33473c422cf26ebc1833aa0628a24245a968230c.tar.bz2
nixpkgs-33473c422cf26ebc1833aa0628a24245a968230c.tar.lz
nixpkgs-33473c422cf26ebc1833aa0628a24245a968230c.tar.xz
nixpkgs-33473c422cf26ebc1833aa0628a24245a968230c.tar.zst
nixpkgs-33473c422cf26ebc1833aa0628a24245a968230c.zip
fuse3: 3.9.4 -> 3.10.0 (#100075)
Diffstat (limited to 'pkgs/os-specific/linux/fuse')
-rw-r--r--pkgs/os-specific/linux/fuse/common.nix4
-rw-r--r--pkgs/os-specific/linux/fuse/default.nix4
2 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index 2010be53c2d..19c64106701 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -60,10 +60,6 @@ in stdenv.mkDerivation rec {
       # ./fuse3-install_man.patch)
       install -D -m444 doc/fusermount3.1 $out/share/man/man1/fusermount3.1
       install -D -m444 doc/mount.fuse3.8 $out/share/man/man8/mount.fuse3.8
-
-      # TODO: Temporary version fix:
-      substituteInPlace meson.build \
-        --replace "version: '3.9.3'" "version: '${version}'"
     '' else ''
       sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
       ./makeconf.sh
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 8c342743dfc..7549f379f8a 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.9.4";
-    sha256Hash = "1j11niqw3p94yd6mfdrkdra0nic8a38fc179y5h9yz81q39m2f3b";
+    version = "3.10.0";
+    sha256Hash = "05ipzmlk6xci9v4sf0pap542b37aszghlchswl6s76fg6h3w4yms";
   };
 }