1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 01:51:24 +00:00
Commit graph

12 commits

Author SHA1 Message Date
Vladimír Čunát 765d695b89
Merge branch 'staging-next'
Security fixes for a few packages are included.
2018-08-21 15:36:02 +02:00
Markus Kowalewski da7a32ef17
fuse: add license 2018-08-20 00:47:52 +02:00
Jan Malakhovski 662756bb6d fuse: make tests run, but disable 2018-08-11 09:35:31 +00:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Michael Weiss fa6941f108 fuse3: 3.2.3 -> 3.2.4 2018-07-13 16:43:21 +02:00
Michael Weiss d3e3e131f5 fuse3: 3.2.2 -> 3.2.3 2018-05-11 22:12:53 +02:00
Michael Raskin 085eab7ef6 fuse3: install fuse.conf without execute bit 2018-04-01 23:02:25 +02:00
Michael Weiss c00b5bf6a2 fuse3: 3.2.1 -> 3.2.2
Stop using bin/mount.fuse from fuse3 for fuse2 (mount.fuse from fuse3
isn't guaranteed to remain backwards compatible).
2018-04-01 01:55:14 +02:00
Shea Levy ed5bd8ad49
fuse: Fix cross-compilation 2018-02-28 15:01:32 -05:00
Michael Weiss f46003798e fuse3: 3.2.0 -> 3.2.1 2017-11-15 13:42:44 +01:00
Michael Weiss 1a9467edd5 fuse3: 3.1.1 -> 3.2.0 2017-09-23 21:31:15 +02:00
Michael Weiss 351f5fc585 fuse3: init at 3.1.1
This includes fuse-common (fusePackages.fuse_3.common) as recommended by
upstream. But while fuse(2) and fuse3 would normally depend on
fuse-common we can't do that in nixpkgs while fuse-common is just
another output from the fuse3 multiple-output derivation (i.e. this
would result in a circular dependency). To avoid building fuse3 twice I
decided it would be best to copy the shared files (i.e. the ones
provided by fuse(2) and fuse3) from fuse-common to fuse (version 2) and
avoid collision warnings by defining priorities. Now it should be
possible to install an arbitrary combination of "fuse", "fuse3", and
"fuse-common" without getting any collision warnings. The end result
should be the same and all changes should be backwards compatible
(assuming that mount.fuse from fuse3 is backwards compatible as stated
by upstream [0] - if not this might break some /etc/fstab definitions
but that should be very unlikely).

My tests with sshfs (version 2 and 3) didn't show any problems.

See #28409 for some additional information.

[0]: https://github.com/libfuse/libfuse/releases/tag/fuse-3.0.0
2017-09-21 23:59:46 +02:00