diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-03-21 21:41:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-21 21:41:37 +0100 |
| commit | 68e9ddacc2945893addf50f3721d6d530006dab6 (patch) | |
| tree | 478fc204536c00bb1b3aab316468f22126460d9f /pkgs/os-specific/linux/fuse | |
| parent | 0d933551009e354715082f9759e064df9f5aed74 (diff) | |
| download | nixpkgs-68e9ddacc2945893addf50f3721d6d530006dab6.tar nixpkgs-68e9ddacc2945893addf50f3721d6d530006dab6.tar.gz nixpkgs-68e9ddacc2945893addf50f3721d6d530006dab6.tar.bz2 nixpkgs-68e9ddacc2945893addf50f3721d6d530006dab6.tar.lz nixpkgs-68e9ddacc2945893addf50f3721d6d530006dab6.tar.xz nixpkgs-68e9ddacc2945893addf50f3721d6d530006dab6.tar.zst nixpkgs-68e9ddacc2945893addf50f3721d6d530006dab6.zip | |
fuse3: 3.9.0 -> 3.9.1 (#82999)
Diffstat (limited to 'pkgs/os-specific/linux/fuse')
| -rw-r--r-- | pkgs/os-specific/linux/fuse/common.nix | 11 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/fuse/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch | 6 |
3 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 35c91c5ec07..b0f684e6242 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -84,8 +84,17 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { + description = "Library that allows filesystems to be implemented in user space"; + longDescription = '' + FUSE (Filesystem in Userspace) is an interface for userspace programs to + export a filesystem to the Linux kernel. The FUSE project consists of two + components: The fuse kernel module (maintained in the regular kernel + repositories) and the libfuse userspace library (this package). libfuse + provides the reference implementation for communicating with the FUSE + kernel module. + ''; inherit (src.meta) homepage; - description = "Kernel module and library that allows filesystems to be implemented in user space"; + changelog = "https://github.com/libfuse/libfuse/releases/tag/fuse-${version}"; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl21 ]; maintainers = [ maintainers.primeos ]; diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 6792e05829d..415226509b7 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.9.0"; - sha256Hash = "00yppzmv15jqjy3wq5ki9d49jl6bfxrlwr5sfz50ihr40d6dgx9p"; + version = "3.9.1"; + sha256Hash = "1i3f4h3vnjxls8hdi6w2n2ksrgbs7brbzj65rvxginyxicykh857"; }; } diff --git a/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch b/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch index 1d41a26b0a4..903f30325df 100644 --- a/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch +++ b/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch @@ -1,12 +1,12 @@ --- a/lib/meson.build +++ b/lib/meson.build -@@ -36,8 +36,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(), +@@ -37,8 +37,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(), soversion: '3', include_directories: include_dirs, dependencies: deps, install: true, link_depends: 'fuse_versionscript', -- c_args: [ '-DFUSE_USE_VERSION=34', +- c_args: [ '-DFUSE_USE_VERSION=35', - '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ], -+ c_args: [ '-DFUSE_USE_VERSION=34' ], ++ c_args: [ '-DFUSE_USE_VERSION=35' ], link_args: ['-Wl,--version-script,' + meson.current_source_dir() + '/fuse_versionscript' ]) |