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

fuse3: 3.2.1 -> 3.2.2

Browse Source 
Stop using bin/mount.fuse from fuse3 for fuse2 (mount.fuse from fuse3
isn't guaranteed to remain backwards compatible).
This commit is contained in:
Michael Weiss 2018-04-01 01:55:14 +02:00
parent a4dc9ef13e
commit c00b5bf6a2
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,9 @@ in stdenv.mkDerivation rec {
url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa"; sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";
}) })
++ stdenv.lib.optional isFuse3 ./fuse3-install.patch; ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch
# TODO: Only relevant for 3.2.2 (opened an upstream issue)
++ stdenv.lib.optional isFuse3 ./fuse3-fix-version.patch;
nativeBuildInputs = if isFuse3 nativeBuildInputs = if isFuse3
@ -63,11 +65,11 @@ in stdenv.mkDerivation rec {
postFixup = "cd $out\n" + (if isFuse3 then '' postFixup = "cd $out\n" + (if isFuse3 then ''
mv bin/mount.fuse3 bin/mount.fuse mv bin/mount.fuse3 bin/mount.fuse
install -D -m555 bin/mount.fuse $common/bin/mount.fuse install -D -m555 etc/fuse.conf $common/etc/fuse.conf
install -D -m444 etc/udev/rules.d/99-fuse.rules $common/etc/udev/rules.d/99-fuse.rules 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 install -D -m444 share/man/man8/mount.fuse.8.gz $common/share/man/man8/mount.fuse.8.gz
'' else '' '' else ''
cp ${fusePackages.fuse_3.common}/bin/mount.fuse bin/mount.fuse 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}/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 cp ${fusePackages.fuse_3.common}/share/man/man8/mount.fuse.8.gz share/man/man8/mount.fuse.8.gz
''); '');

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

@ -13,8 +13,8 @@ in {
}; };
fuse_3 = mkFuse { fuse_3 = mkFuse {
version = "3.2.1"; version = "3.2.2";
sha256Hash = "19bsvb5lc8k1i0h5ld109kixn6mdshzvg3y7820k9mnw34kh09y0"; sha256Hash = "1a0x4vpyg9lc6clwvx995mk0v6jqd37xabzp9rpdir37x814g3wh";
maintainers = [ maintainers.primeos ]; maintainers = [ maintainers.primeos ];
}; };
} }

8
pkgs/os-specific/linux/fuse/fuse3-fix-version.patch Normal file
View File

@ -0,0 +1,8 @@
--- a/meson.build 2018-04-01 01:05:19.612723597 +0200
+++ b/meson.build 2018-04-01 01:40:58.171109615 +0200
@@ -1,4 +1,4 @@
-project('libfuse3', 'c', version: '3.2.1',
+project('libfuse3', 'c', version: '3.2.2',
meson_version: '>= 0.38',
default_options: [ 'buildtype=debugoptimized' ])

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

@ -1,6 +1,6 @@
--- a/util/install_helper.sh 1970-01-01 01:00:01.000000000 +0100 --- a/util/install_helper.sh 2018-04-01 01:05:19.613723599 +0200
+++ b/util/install_helper.sh 2017-09-21 23:43:50.703942577 +0200 +++ b/util/install_helper.sh 2018-04-01 01:06:02.952845382 +0200
@@ -11,19 +11,11 @@ @@ -11,22 +11,14 @@
udevrulesdir="$3" udevrulesdir="$3"
prefix="${MESON_INSTALL_DESTDIR_PREFIX}" prefix="${MESON_INSTALL_DESTDIR_PREFIX}"
@ -14,11 +14,15 @@
- -
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"
+ "${prefix}/${udevrulesdir}/99-fuse.rules" + "${prefix}/${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}/etc/init.d/fuse3" - "${DESTDIR}/etc/init.d/fuse3"
+ "${prefix}/etc/init.d/fuse3" + "${prefix}/etc/init.d/fuse3"
install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
- "${DESTDIR}/etc/fuse.conf"
+ "${prefix}/etc/fuse.conf"
if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then 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 /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true