From 5b820f714dfefe6371197244b4f0bf6aa5e176ef Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 23 Mar 2022 20:42:00 +0100 Subject: [PATCH 1/2] xfsprogs: 5.13.0 -> 5.14.2 --- pkgs/tools/filesystems/xfsprogs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 730932141b54..91225e6b97c6 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, buildPackages, fetchurl, autoconf, automake, gettext, libtool, pkg-config -, icu, libuuid, readline, inih +, icu, libuuid, readline, inih, liburcu }: stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "5.13.0"; + version = "5.14.2"; src = fetchurl { url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; - sha256 = "sha256-ThQtS6vghq35AW2MYGyAWCnaCORjiaRDP0A0YgT5DNs="; + sha256 = "sha256-AczT753yg3dTpdh2uNqE6pV9E9ekYbjEbor6TrCaq8g="; }; outputs = [ "bin" "dev" "out" "doc" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { autoconf automake libtool gettext pkg-config libuuid # codegen tool uses libuuid ]; - buildInputs = [ readline icu inih ]; + buildInputs = [ readline icu inih liburcu ]; propagatedBuildInputs = [ libuuid ]; # Dev headers include enableParallelBuilding = true; From 16bce5f2fe28c9a0e2eae10f9c83e0211fa3dfb3 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 24 Mar 2022 01:12:24 +0100 Subject: [PATCH 2/2] nixosTests.installer.lvm: adjust root LV size install ran out of disk space after 5b820f714dfefe6371197244b4f0bf6aa5e176ef --- nixos/tests/installer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 5525c3117b79..2cfadf85c935 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -568,7 +568,7 @@ in { "pvcreate /dev/vda1 /dev/vda2", "vgcreate MyVolGroup /dev/vda1 /dev/vda2", "lvcreate --size 1G --name swap MyVolGroup", - "lvcreate --size 3G --name nixos MyVolGroup", + "lvcreate --size 6G --name nixos MyVolGroup", "mkswap -f /dev/MyVolGroup/swap -L swap", "swapon -L swap", "mkfs.xfs -L nixos /dev/MyVolGroup/nixos",