From 6e4a53de74f6ca31c21e5e3458ea10a281029772 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 20:43:39 +0000
Subject: [PATCH] * dmidecode 2.10.

svn path=/nixpkgs/trunk/; revision=16678
---
 pkgs/os-specific/linux/dmidecode/2.9.nix     | 22 --------------------
 pkgs/os-specific/linux/dmidecode/default.nix | 17 +++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 ++--
 3 files changed, 19 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/dmidecode/2.9.nix
 create mode 100644 pkgs/os-specific/linux/dmidecode/default.nix

diff --git a/pkgs/os-specific/linux/dmidecode/2.9.nix b/pkgs/os-specific/linux/dmidecode/2.9.nix
deleted file mode 100644
index e0b46b35e4e..00000000000
--- a/pkgs/os-specific/linux/dmidecode/2.9.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://download.savannah.gnu.org/releases/dmidecode/dmidecode-2.9.tar.bz2;
-			sha256 = "05g0ln400fhqjspg9h4x0a1dvmwiyjq5rk9q9kimxvywbg1b53l8";
-		};
-
-		buildInputs = [];
-		configureFlags = [];
-		makeFlags = "prefix=\$out";
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "dmidecode-"+version;
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [ doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "Tool to decode Desktop Management Interface and SBIOS data";
-		inherit src;
-	};
-}
diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix
new file mode 100644
index 00000000000..4e9c49e4f58
--- /dev/null
+++ b/pkgs/os-specific/linux/dmidecode/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "dmidecode-2.10";
+
+  src = fetchurl {
+    url = "http://www.very-clever.com/download/nongnu/dmidecode/${name}.tar.bz2";
+    sha256 = "1h72r5scrpvgw60hif5msjg6vw2x0jd6z094lhbh6cjk6gls6x2d";
+  };
+
+  makeFlags = "prefix=$(out)";
+
+  meta = {
+    homepage = http://www.nongnu.org/dmidecode/;
+    description = "A tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a450d1cd5af..e185b58dafb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4715,8 +4715,8 @@ let
     inherit fetchurl stdenv;
   };
 
-  dmidecode = composedArgsAndFun (selectVersion ../os-specific/linux/dmidecode "2.9") {
-    inherit fetchurl stdenv builderDefs;
+  dmidecode = import ../os-specific/linux/dmidecode {
+    inherit fetchurl stdenv;
   };
 
   dietlibc = import ../os-specific/linux/dietlibc {