From 1fb82557f99c6c220a30d4241db9b594f0d35f9f Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Mon, 19 Aug 2024 14:55:18 -0700 Subject: [PATCH 1/4] Reapply "erofs-utils: 1.7.1 -> 1.8.1" This reverts commit 13c304eb480a7f3492ab9dc056ed5a90fad45f53. --- pkgs/tools/filesystems/erofs-utils/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index 5346403fa0e0..5bfd77cb56ab 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -4,15 +4,15 @@ , lzmaSupport ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "erofs-utils"; - version = "1.7.1"; + 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="; + "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 ]; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ehmry nikstur ]; platforms = platforms.unix; }; -} +}) From 6551c83ac903299ab9108dbe0ddc174ec91c9f62 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Mon, 19 Aug 2024 14:55:24 -0700 Subject: [PATCH 2/4] Reapply "erofs-utils: add jmbaur as maintainer" This reverts commit 52ee4c79f6f502c1a4e90e910819da83340f2818. --- pkgs/tools/filesystems/erofs-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index 5bfd77cb56ab..9c9aa2d993f2 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { 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; }; }) From 71b77717c9d53326188b6769f559cddaaf2b926c Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Mon, 19 Aug 2024 14:55:31 -0700 Subject: [PATCH 3/4] Reapply "erofs-utils: nixfmt" This reverts commit d45aacd26b0cd8f2f6a06c9456f8b7175b45602d. --- .../tools/filesystems/erofs-utils/default.nix | 51 ++++++++++++++----- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index 9c9aa2d993f2..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 (finalAttrs: { pname = "erofs-utils"; version = "1.8.1"; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; src = fetchurl { - url = - "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; + 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 (finalAttrs: { 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 jmbaur ]; + maintainers = with maintainers; [ + ehmry + nikstur + jmbaur + ]; platforms = platforms.unix; }; }) From cd998f9de9f74f1b753d3b07e5c41b4aa52f6fc6 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Mon, 19 Aug 2024 14:55:55 -0700 Subject: [PATCH 4/4] nixos/qemu-vm: suppress mkfs.erofs output The mkfs.erofs utility has a lot of output by default that slows down running tests. We don't need to capture any of the output from mkfs.erofs, so we can suppress it. --- nixos/modules/virtualisation/qemu-vm.nix | 1 + 1 file changed, 1 insertion(+) 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} \