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

* Updated LVM2 to 2.02.56. LVM2 now includes device-mapper, so that 

package is obsolete.  Also install the udev rules.

svn path=/nixpkgs/trunk/; revision=19293
This commit is contained in:
Eelco Dolstra 2010-01-07 16:14:10 +00:00
parent 0f38401813
commit 645ae45d55
3 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/os-specific/linux/device-mapper/default.nix
View File

@ -1,17 +0,0 @@
{stdenv, fetchurl, enableStatic ? true}:
stdenv.mkDerivation {
name = "device-mapper-1.02.27";
src = fetchurl {
url = ftp://sources.redhat.com/pub/dm/device-mapper.1.02.27.tgz;
sha256 = "1z4dldjjxfinwvg39x4m2cm5rcsbxs833g3phm34f5a2lwh7i6v6";
};
inherit enableStatic;
configureFlags = if enableStatic then "--enable-static_link" else "";
# To prevent make install from failing.
installFlags = "OWNER= GROUP=";
}

21
pkgs/os-specific/linux/lvm2/default.nix
View File

@ -1,21 +1,20 @@
{stdenv, fetchurl, devicemapper, enableStatic ? true}: { stdenv, fetchurl }:
assert enableStatic -> devicemapper.enableStatic;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "lvm2-2.02.39"; name = "lvm2-2.02.56";
src = fetchurl { src = fetchurl {
url = ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.39.tgz; url = ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.56.tgz;
sha256 = "18nfy7lj9fjjqjjd9dmb4v8away7cpi51ss1k8gd0yrh77dbsyyh"; sha256 = "0hrgca93jnc3k05cgc3rc5klvc03anxmqydgljv6qq59nhnfz5lw";
}; };
buildInputs = [devicemapper]; configureFlags = "--disable-readline --enable-udev_rules --enable-udev_sync";
inherit enableStatic;
configureFlags = "--disable-readline ${if enableStatic then "--enable-static_link" else ""}";
# To prevent make install from failing. # To prevent make install from failing.
preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\""; preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\"";
meta = {
homepage = http://sourceware.org/lvm2/;
descriptions = "Tools to support Logical Volume Management (LVM) on Linux";
};
} }

6
pkgs/top-level/all-packages.nix
View File

@ -5276,9 +5276,7 @@ let
inherit stdenv; inherit stdenv;
}; };
devicemapper = import ../os-specific/linux/device-mapper { devicemapper = lvm2;
inherit fetchurl stdenv;
};
dmidecode = import ../os-specific/linux/dmidecode { dmidecode = import ../os-specific/linux/dmidecode {
inherit fetchurl stdenv; inherit fetchurl stdenv;
@ -5722,7 +5720,7 @@ let
}; };
lvm2 = import ../os-specific/linux/lvm2 { lvm2 = import ../os-specific/linux/lvm2 {
inherit fetchurl stdenv devicemapper; inherit fetchurl stdenv;
}; };
mdadm = import ../os-specific/linux/mdadm { mdadm = import ../os-specific/linux/mdadm {