From 21caeaf0235d374d994359934feefe64798e34cc Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Tue, 25 Feb 2025 09:42:50 +0000 Subject: [PATCH 1/2] erofs-utils: enable lzma by default aligns with upstream since 1.8 https://github.com/erofs/erofs-utils/commit/37ada1b449ae823ca6d596059e5fbe78c4b6cc63 --- pkgs/by-name/er/erofs-utils/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix index a544e91ec41b..4f4e280b3e4f 100644 --- a/pkgs/by-name/er/erofs-utils/package.nix +++ b/pkgs/by-name/er/erofs-utils/package.nix @@ -12,7 +12,6 @@ libselinux, fuseSupport ? stdenv.hostPlatform.isLinux, selinuxSupport ? false, - lzmaSupport ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -37,16 +36,15 @@ stdenv.mkDerivation (finalAttrs: { util-linux lz4 zlib + xz ] ++ lib.optionals fuseSupport [ fuse ] - ++ lib.optionals selinuxSupport [ libselinux ] - ++ lib.optionals lzmaSupport [ xz ]; + ++ lib.optionals selinuxSupport [ libselinux ]; configureFlags = [ "MAX_BLOCK_SIZE=4096" ] ++ lib.optional fuseSupport "--enable-fuse" - ++ lib.optional selinuxSupport "--with-selinux" - ++ lib.optional lzmaSupport "--enable-lzma"; + ++ lib.optional selinuxSupport "--with-selinux"; meta = with lib; { homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/"; From 07d7d24745a9279507fa5a1da522241e587114a6 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Tue, 25 Feb 2025 09:44:09 +0000 Subject: [PATCH 2/2] erofs-utils: enable zstd --- pkgs/by-name/er/erofs-utils/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix index 4f4e280b3e4f..32d0ba0f81fe 100644 --- a/pkgs/by-name/er/erofs-utils/package.nix +++ b/pkgs/by-name/er/erofs-utils/package.nix @@ -9,6 +9,7 @@ lz4, xz, zlib, + zstd, libselinux, fuseSupport ? stdenv.hostPlatform.isLinux, selinuxSupport ? false, @@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { lz4 zlib xz + zstd ] ++ lib.optionals fuseSupport [ fuse ] ++ lib.optionals selinuxSupport [ libselinux ];