mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 14:41:27 +00:00
Merge pull request #165494 from helsinki-systems/upd/xfsprogs
xfsprogs: 5.13.0 -> 5.14.2
This commit is contained in:
commit
fae56a205e
@ -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",
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user