nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

fuse3: 3.6.1 -> 3.6.2

+15 -31
+4 -1
pkgs/os-specific/linux/fuse/common.nix
··· 38 38 39 39 outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common"; 40 40 41 - mesonFlags = stdenv.lib.optional isFuse3 "-Dudevrulesdir=etc/udev/rules.d"; 41 + mesonFlags = stdenv.lib.optionals isFuse3 [ 42 + "-Dudevrulesdir=/udev/rules.d" 43 + "-Duseroot=false" 44 + ]; 42 45 43 46 preConfigure = '' 44 47 export MOUNT_FUSE_PATH=$out/sbin
+2 -2
pkgs/os-specific/linux/fuse/default.nix
··· 11 11 }; 12 12 13 13 fuse_3 = mkFuse { 14 - version = "3.6.1"; 15 - sha256Hash = "1118r2nx64cpv9s5a6dgh49y0pnjcc5ybpkh5pigxf14bpqa26pb"; 14 + version = "3.6.2"; 15 + sha256Hash = "1cxx94q6zqns1iw5d4g3ll8f78swqxl6h25bpxmqkqsj6c91pzkl"; 16 16 }; 17 17 }
+9 -28
pkgs/os-specific/linux/fuse/fuse3-install.patch
··· 1 - --- a/util/install_helper.sh 2018-08-31 21:22:34.580563286 +0200 2 - +++ b/util/install_helper.sh 2018-08-31 21:30:54.837939149 +0200 3 - @@ -22,30 +22,11 @@ 4 - DESTDIR="${DESTDIR%/}" 1 + --- a/util/install_helper.sh 2019-07-10 12:00:15.984840142 +0200 2 + +++ b/util/install_helper.sh 2019-07-10 12:28:56.343011401 +0200 3 + @@ -37,10 +37,10 @@ 5 4 fi 6 5 7 - -chown root:root "${DESTDIR}${bindir}/fusermount3" 8 - -chmod u+s "${DESTDIR}${bindir}/fusermount3" 9 - - 10 - install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \ 11 - "${DESTDIR}${sysconfdir}/fuse.conf" 12 - 13 - - 14 - -if test ! -e "${DESTDIR}/dev/fuse"; then 15 - - mkdir -p "${DESTDIR}/dev" 16 - - mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229 17 - -fi 18 - - 19 6 install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ 20 7 - "${DESTDIR}${udevrulesdir}/99-fuse3.rules" 21 - + "${sysconfdir}/udev/rules.d/99-fuse3.rules" 8 + + "${sysconfdir}${udevrulesdir}/99-fuse3.rules" 22 9 23 10 install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ 24 - "${DESTDIR}${sysconfdir}/init.d/fuse3" 25 - - 26 - - 27 - -if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then 28 - - /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true 29 - -else 30 - - echo "== FURTHER ACTION REQUIRED ==" 31 - - echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script" 32 - -fi 33 - - 34 - - 11 + - "${DESTDIR}/etc/init.d/fuse3" 12 + + "${sysconfdir}/init.d/fuse3" 13 + 14 + 15 + if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then 35 16 diff --git a/util/meson.build b/util/meson.build 36 17 index aa0e734..06d4378 100644 37 18 --- a/util/meson.build