colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #165494 from helsinki-systems/upd/xfsprogs

Browse Source 
xfsprogs: 5.13.0 -> 5.14.2
This commit is contained in:
Janne Heß 2022-03-26 18:31:11 +01:00 committed by GitHub
commit fae56a205e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/installer.nix
View File

@ -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",

8
pkgs/tools/filesystems/xfsprogs/default.nix
View File

@ -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 <uuid/uuid.h>
enableParallelBuilding = true;