From ff03fa451121acc03ac71267b87169c0316498cd Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 May 2010 18:43:10 +0000 Subject: [PATCH] Upgrade lvm2 svn path=/nixpkgs/trunk/; revision=21791 --- pkgs/os-specific/linux/lvm2/default.nix | 14 ++++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 26c2e3c392a..a0346336273 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,14 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, udev }: + +let + v = "2.02.64"; +in stdenv.mkDerivation { - name = "lvm2-2.02.56"; + name = "lvm2-${v}"; src = fetchurl { - url = ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.56.tgz; - sha256 = "0hrgca93jnc3k05cgc3rc5klvc03anxmqydgljv6qq59nhnfz5lw"; + url = "ftp://sources.redhat.com/pub/lvm2/LVM2.${v}.tgz"; + sha256 = "130yg8a9l0266hraklalm2k26n25a8kb2nvhj13cnczfxbz5a4m0"; }; configureFlags = "--disable-readline --enable-udev_rules --enable-udev_sync"; + + buildInputs = [ udev ]; # To prevent make install from failing. preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\""; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8e21863664..3cd896ffaa5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6508,7 +6508,7 @@ let }; lvm2 = import ../os-specific/linux/lvm2 { - inherit fetchurl stdenv; + inherit fetchurl stdenv udev; }; machHeaders = import ../os-specific/gnu/mach {