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

fuse3: 3.2.2 -> 3.2.3

Browse Source
This commit is contained in:
Michael Weiss 2018-05-11 21:48:38 +02:00
parent 4f06c77709
commit d3e3e131f5
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ version, sha256Hash, maintainers }: { version, sha256Hash }:
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub, fetchpatch
, fusePackages, utillinux, gettext , fusePackages, utillinux, gettext
@ -28,10 +28,7 @@ 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
then [ meson ninja pkgconfig ] then [ meson ninja pkgconfig ]
@ -76,10 +73,10 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with stdenv.lib; {
inherit (src.meta) homepage; inherit (src.meta) homepage;
description = "Kernel module and library that allows filesystems to be implemented in user space"; description = "Kernel module and library that allows filesystems to be implemented in user space";
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
inherit maintainers; maintainers = [ maintainers.primeos ];
}; };
} }

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

@ -4,17 +4,14 @@ let
mkFuse = args: callPackage (import ./common.nix args) { mkFuse = args: callPackage (import ./common.nix args) {
inherit utillinux; inherit utillinux;
}; };
maintainers = stdenv.lib.maintainers;
in { in {
fuse_2 = mkFuse { fuse_2 = mkFuse {
version = "2.9.7"; version = "2.9.7";
sha256Hash = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2"; sha256Hash = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2";
maintainers = [ ];
}; };
fuse_3 = mkFuse { fuse_3 = mkFuse {
version = "3.2.2"; version = "3.2.3";
sha256Hash = "1a0x4vpyg9lc6clwvx995mk0v6jqd37xabzp9rpdir37x814g3wh"; sha256Hash = "185p1vjcsyzpcdkrcyw06zpapv4jc43qw9i8a4amzpgk1rsgg19d";
maintainers = [ maintainers.primeos ];
}; };
} }

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

@ -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' ])