diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 10f69f3a744a..a1aed8c4e917 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -143,6 +143,7 @@ let --transform 'flags=rSh;s|/nix/store/||' \ --files-from ${hostPkgs.closureInfo { rootPaths = [ config.system.build.toplevel regInfo ]; }}/store-paths \ | ${hostPkgs.erofs-utils}/bin/mkfs.erofs \ + --quiet \ --force-uid=0 \ --force-gid=0 \ -L ${nixStoreFilesystemLabel} \ diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index 5346403fa0e0..3946523ccb10 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -1,29 +1,50 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, xz, zlib, libselinux -, fuseSupport ? stdenv.isLinux -, selinuxSupport ? false -, lzmaSupport ? false +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + pkg-config, + fuse, + util-linux, + lz4, + xz, + zlib, + libselinux, + fuseSupport ? stdenv.isLinux, + selinuxSupport ? false, + lzmaSupport ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "erofs-utils"; - version = "1.7.1"; - outputs = [ "out" "man" ]; + version = "1.8.1"; + outputs = [ + "out" + "man" + ]; src = fetchurl { - url = - "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${version}.tar.gz"; - hash = "sha256-GWCD1j5eIx+1eZ586GqUS7ylZNqrzj3pIlqKyp3K/xU="; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; + hash = "sha256-Xb97SS92gkYrl6dxIdQ8p2Cc2Q5l+MlpMa78ggpvDaM="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ util-linux lz4 zlib ] + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = + [ + util-linux + lz4 + zlib + ] ++ lib.optionals fuseSupport [ fuse ] ++ lib.optionals selinuxSupport [ libselinux ] ++ lib.optionals lzmaSupport [ xz ]; - configureFlags = [ - "MAX_BLOCK_SIZE=4096" - ] ++ lib.optional fuseSupport "--enable-fuse" + configureFlags = + [ "MAX_BLOCK_SIZE=4096" ] + ++ lib.optional fuseSupport "--enable-fuse" ++ lib.optional selinuxSupport "--with-selinux" ++ lib.optional lzmaSupport "--enable-lzma"; @@ -32,7 +53,11 @@ stdenv.mkDerivation rec { description = "Userspace utilities for linux-erofs file system"; changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${version}"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ ehmry nikstur ]; + maintainers = with maintainers; [ + ehmry + nikstur + jmbaur + ]; platforms = platforms.unix; }; -} +})