Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Adding libuuid (libblkid) to lvm2.

It wants it to detect if there are filesystems present in block devices, in
case of pvcreate. Otherwise it complaints "lvm built without blkid support" and
lacks the feature of detecting/wiping.

(cherry picked from commit 2f35e223b1e5dab2470c928c85e7119c7cbeb38c)

I fixed an easy conflict.

+2 -2
+2 -2
pkgs/os-specific/linux/lvm2/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }: 1 + { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, libuuid, enable_dmeventd ? false }: 2 2 3 3 let 4 4 version = "2.02.140"; ··· 22 22 ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd"; 23 23 24 24 nativeBuildInputs = [ pkgconfig ]; 25 - buildInputs = [ udev ]; 25 + buildInputs = [ udev libuuid ]; 26 26 27 27 preConfigure = 28 28 ''