diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2018-05-11 21:48:38 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2018-05-11 22:12:53 +0200 |
| commit | d3e3e131f565be1d72e98980e0e22cc0b05f46ec (patch) | |
| tree | 4bc8cb8233d77199ba91980a9626d6fc03a30574 /pkgs/os-specific/linux/fuse | |
| parent | 4f06c77709cb23bd10927c85d4bf24ed4ed82eb2 (diff) | |
| download | nixlib-d3e3e131f565be1d72e98980e0e22cc0b05f46ec.tar nixlib-d3e3e131f565be1d72e98980e0e22cc0b05f46ec.tar.gz nixlib-d3e3e131f565be1d72e98980e0e22cc0b05f46ec.tar.bz2 nixlib-d3e3e131f565be1d72e98980e0e22cc0b05f46ec.tar.lz nixlib-d3e3e131f565be1d72e98980e0e22cc0b05f46ec.tar.xz nixlib-d3e3e131f565be1d72e98980e0e22cc0b05f46ec.tar.zst nixlib-d3e3e131f565be1d72e98980e0e22cc0b05f46ec.zip | |
fuse3: 3.2.2 -> 3.2.3
Diffstat (limited to 'pkgs/os-specific/linux/fuse')
| -rw-r--r-- | pkgs/os-specific/linux/fuse/common.nix | 13 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/fuse/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/fuse/fuse3-fix-version.patch | 8 |
3 files changed, 7 insertions, 21 deletions
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 95011653ad01..04a4a1a0e1f1 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -1,4 +1,4 @@ -{ version, sha256Hash, maintainers }: +{ version, sha256Hash }: { stdenv, fetchFromGitHub, fetchpatch , fusePackages, utillinux, gettext @@ -28,10 +28,7 @@ in stdenv.mkDerivation rec { url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa"; }) - ++ 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; - + ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch; nativeBuildInputs = if isFuse3 then [ meson ninja pkgconfig ] @@ -76,10 +73,10 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Kernel module and library that allows filesystems to be implemented in user space"; - platforms = stdenv.lib.platforms.linux; - inherit maintainers; + platforms = platforms.linux; + maintainers = [ maintainers.primeos ]; }; } diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index ddf280bbe2f7..f308930f0dc5 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -4,17 +4,14 @@ let mkFuse = args: callPackage (import ./common.nix args) { inherit utillinux; }; - maintainers = stdenv.lib.maintainers; in { fuse_2 = mkFuse { version = "2.9.7"; sha256Hash = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2"; - maintainers = [ ]; }; fuse_3 = mkFuse { - version = "3.2.2"; - sha256Hash = "1a0x4vpyg9lc6clwvx995mk0v6jqd37xabzp9rpdir37x814g3wh"; - maintainers = [ maintainers.primeos ]; + version = "3.2.3"; + sha256Hash = "185p1vjcsyzpcdkrcyw06zpapv4jc43qw9i8a4amzpgk1rsgg19d"; }; } diff --git a/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch b/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch deleted file mode 100644 index b6351aab3c01..000000000000 --- a/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- 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' ]) - |