From c3f637d84cb68c037d0c7415361a3182cc7d25b6 Mon Sep 17 00:00:00 2001 From: atagen Date: Sun, 19 Jan 2025 10:14:47 +1100 Subject: [PATCH 1/2] unionfs-fuse: 2.2 -> 3.6 --- pkgs/by-name/un/unionfs-fuse/package.nix | 28 ++++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/un/unionfs-fuse/package.nix b/pkgs/by-name/un/unionfs-fuse/package.nix index fe9b3ff7fd33..53d7b38bd377 100644 --- a/pkgs/by-name/un/unionfs-fuse/package.nix +++ b/pkgs/by-name/un/unionfs-fuse/package.nix @@ -3,18 +3,19 @@ stdenv, fetchFromGitHub, cmake, - fuse, + pkg-config, + fuse3, }: stdenv.mkDerivation rec { pname = "unionfs-fuse"; - version = "2.2"; + version = "3.6"; src = fetchFromGitHub { owner = "rpodgorny"; repo = "unionfs-fuse"; - rev = "v${version}"; - sha256 = "sha256-EJryML6E0CW4kvsqMRqV3cq77j50HuylNzgaHD6CL/o="; + tag = "v${version}"; + hash = "sha256-1Fy3evatfEplgJjAVeXgdq1CkGgIi+iZjsO0WBHmmBM="; }; patches = [ @@ -27,11 +28,14 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ - --replace '/usr/local/include/osxfuse/fuse' '${lib.getDev fuse}/include/fuse' + --replace '/usr/local/include/osxfuse/fuse' '${lib.getDev fuse3}/include/fuse' ''; - nativeBuildInputs = [ cmake ]; - buildInputs = [ fuse ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ fuse3 ]; # Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it # possible to do: @@ -42,16 +46,16 @@ stdenv.mkDerivation rec { preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p $out/sbin cp -a mount.unionfs $out/sbin/mount.unionfs-fuse - substituteInPlace $out/sbin/mount.unionfs-fuse --replace mount.fuse ${fuse}/sbin/mount.fuse + substituteInPlace $out/sbin/mount.unionfs-fuse --replace mount.fuse ${fuse3}/sbin/mount.fuse3 substituteInPlace $out/sbin/mount.unionfs-fuse --replace unionfs $out/bin/unionfs ''; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; description = "FUSE UnionFS implementation"; homepage = "https://github.com/rpodgorny/unionfs-fuse"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ orivej ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.orivej ]; }; } From f835a25c46a5c4d64e2e2dc25a63e4429bf93fe0 Mon Sep 17 00:00:00 2001 From: atagen Date: Sun, 19 Jan 2025 10:15:56 +1100 Subject: [PATCH 2/2] unionfs-fuse: add update script --- pkgs/by-name/un/unionfs-fuse/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/un/unionfs-fuse/package.nix b/pkgs/by-name/un/unionfs-fuse/package.nix index 53d7b38bd377..044d53d94784 100644 --- a/pkgs/by-name/un/unionfs-fuse/package.nix +++ b/pkgs/by-name/un/unionfs-fuse/package.nix @@ -1,4 +1,5 @@ { + nix-update-script, lib, stdenv, fetchFromGitHub, @@ -50,6 +51,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/sbin/mount.unionfs-fuse --replace unionfs $out/bin/unionfs ''; + passthru.updateScript = nix-update-script { }; + meta = { broken = stdenv.hostPlatform.isDarwin; description = "FUSE UnionFS implementation";