From 645ae45d55dfbaac882cc5b3eebf8b7e466ef33b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jan 2010 16:14:10 +0000
Subject: * 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
---
 pkgs/os-specific/linux/device-mapper/default.nix | 17 -----------------
 pkgs/os-specific/linux/lvm2/default.nix          | 21 ++++++++++-----------
 2 files changed, 10 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/device-mapper/default.nix

(limited to 'pkgs/os-specific/linux')

diff --git a/pkgs/os-specific/linux/device-mapper/default.nix b/pkgs/os-specific/linux/device-mapper/default.nix
deleted file mode 100644
index d17cebe3fd5..00000000000
--- a/pkgs/os-specific/linux/device-mapper/default.nix
+++ /dev/null
@@ -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=";
-}
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index d33de1bd50e..26c2e3c392a 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,21 +1,20 @@
-{stdenv, fetchurl, devicemapper, enableStatic ? true}:
-
-assert enableStatic -> devicemapper.enableStatic;
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "lvm2-2.02.39";
+  name = "lvm2-2.02.56";
   
   src = fetchurl {
-    url = ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.39.tgz;
-    sha256 = "18nfy7lj9fjjqjjd9dmb4v8away7cpi51ss1k8gd0yrh77dbsyyh";
+    url = ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.56.tgz;
+    sha256 = "0hrgca93jnc3k05cgc3rc5klvc03anxmqydgljv6qq59nhnfz5lw";
   };
   
-  buildInputs = [devicemapper];
-
-  inherit enableStatic;
-  
-  configureFlags = "--disable-readline ${if enableStatic then "--enable-static_link" else ""}";
+  configureFlags = "--disable-readline --enable-udev_rules --enable-udev_sync";
   
   # To prevent make install from failing.
   preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\"";
+
+  meta = {
+    homepage = http://sourceware.org/lvm2/;
+    descriptions = "Tools to support Logical Volume Management (LVM) on Linux";
+  };
 }
-- 
cgit 1.4.1