public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fuse3: 3.6.1 -> 3.6.2

Browse Source
This commit is contained in:
Michael Weiss 2019-07-10 13:20:40 +02:00
parent 11b8159328
commit 50464716e3
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
3 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/fuse/common.nix
View File

@ -38,7 +38,10 @@ in stdenv.mkDerivation rec {
outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common"; outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common";
mesonFlags = stdenv.lib.optional isFuse3 "-Dudevrulesdir=etc/udev/rules.d"; mesonFlags = stdenv.lib.optionals isFuse3 [
"-Dudevrulesdir=/udev/rules.d"
"-Duseroot=false"
];
preConfigure = '' preConfigure = ''
export MOUNT_FUSE_PATH=$out/sbin export MOUNT_FUSE_PATH=$out/sbin

4
pkgs/os-specific/linux/fuse/default.nix
View File

@ -11,7 +11,7 @@ in {
}; };
fuse_3 = mkFuse { fuse_3 = mkFuse {
version = "3.6.1"; version = "3.6.2";
sha256Hash = "1118r2nx64cpv9s5a6dgh49y0pnjcc5ybpkh5pigxf14bpqa26pb"; sha256Hash = "1cxx94q6zqns1iw5d4g3ll8f78swqxl6h25bpxmqkqsj6c91pzkl";
}; };
} }

37
pkgs/os-specific/linux/fuse/fuse3-install.patch
View File

@ -1,37 +1,18 @@
--- a/util/install_helper.sh 2018-08-31 21:22:34.580563286 +0200 --- a/util/install_helper.sh 2019-07-10 12:00:15.984840142 +0200
+++ b/util/install_helper.sh 2018-08-31 21:30:54.837939149 +0200 +++ b/util/install_helper.sh 2019-07-10 12:28:56.343011401 +0200
@@ -22,30 +22,11 @@ @@ -37,10 +37,10 @@
DESTDIR="${DESTDIR%/}"
fi fi
-chown root:root "${DESTDIR}${bindir}/fusermount3"
-chmod u+s "${DESTDIR}${bindir}/fusermount3"
-
install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
"${DESTDIR}${sysconfdir}/fuse.conf"
-
-if test ! -e "${DESTDIR}/dev/fuse"; then
- mkdir -p "${DESTDIR}/dev"
- mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229
-fi
-
install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
- "${DESTDIR}${udevrulesdir}/99-fuse3.rules" - "${DESTDIR}${udevrulesdir}/99-fuse3.rules"
+ "${sysconfdir}/udev/rules.d/99-fuse3.rules" + "${sysconfdir}${udevrulesdir}/99-fuse3.rules"
install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
"${DESTDIR}${sysconfdir}/init.d/fuse3" - "${DESTDIR}/etc/init.d/fuse3"
- + "${sysconfdir}/init.d/fuse3"
-
-if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
- /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
-else
- echo "== FURTHER ACTION REQUIRED =="
- echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script"
-fi
-
-
diff --git a/util/meson.build b/util/meson.build diff --git a/util/meson.build b/util/meson.build
index aa0e734..06d4378 100644 index aa0e734..06d4378 100644
--- a/util/meson.build --- a/util/meson.build