Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 62f8e255a49e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 137142a72cd6
Choose a head ref
  • 2 commits
  • 8 files changed
  • 1 contributor

Commits on Sep 21, 2017

  1. 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
    @primeos
    primeos committed Sep 21, 2017
    Configuration menu
    Copy the full SHA
    351f5fc View commit details
    Browse the repository at this point in the history

  2. sshfs-fuse: 2.10 -> 3.2.0

    @primeos
    primeos committed Sep 21, 2017
    2 Configuration menu
    Copy the full SHA
    137142a View commit details
    Browse the repository at this point in the history