summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-03-06 13:06:32 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-03-06 13:06:32 +0000
commite75e52f61fe0a456260ed5fba2bf5147f98bc1e3 (patch)
treeb4a15c5711c36b3fbe3e027b7d28ac70e779c4e9
parentf2f87036ce821540ec8cc62021d233e8b9f3eb70 (diff)
downloadnixpkgs-e75e52f61fe0a456260ed5fba2bf5147f98bc1e3.tar
nixpkgs-e75e52f61fe0a456260ed5fba2bf5147f98bc1e3.tar.gz
nixpkgs-e75e52f61fe0a456260ed5fba2bf5147f98bc1e3.tar.bz2
nixpkgs-e75e52f61fe0a456260ed5fba2bf5147f98bc1e3.tar.lz
nixpkgs-e75e52f61fe0a456260ed5fba2bf5147f98bc1e3.tar.xz
nixpkgs-e75e52f61fe0a456260ed5fba2bf5147f98bc1e3.tar.zst
nixpkgs-e75e52f61fe0a456260ed5fba2bf5147f98bc1e3.zip
* HAL 0.5.10.
svn path=/nixpkgs/trunk/; revision=10985
-rw-r--r--pkgs/os-specific/linux/hal/default.nix8
-rw-r--r--pkgs/os-specific/linux/libvolume_id/default.nix6
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix
index ce41a29a9fe..c7cde0e96cf 100644
--- a/pkgs/os-specific/linux/hal/default.nix
+++ b/pkgs/os-specific/linux/hal/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "hal-0.5.9";
+  name = "hal-0.5.10";
   
   src = fetchurl {
-    url = http://people.freedesktop.org/~david/dist/hal-0.5.9.tar.gz;
-    sha256 = "178cm30kshwvs0kf5d3l9cn4hyhfv5h6c6q0qnl0jxhynvpgin35";
+    url = http://hal.freedesktop.org/releases/hal-0.5.10.tar.gz;
+    sha256 = "0k6bgavkry7sl1wwpwfpk15r52b75gfql2qgyijaqaxg826a2was";
   };
   
   buildInputs = [
@@ -24,6 +24,8 @@ stdenv.mkDerivation {
     --with-eject=${eject}/bin/eject
   ";
 
+  propagatedBuildInputs = [libusb];
+
   preBuild = "
     substituteInPlace hald/linux/coldplug.c --replace /usr/bin/udevinfo ${udev}/bin/udevinfo
   ";
diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix
index 91de928994a..3deaa7097c4 100644
--- a/pkgs/os-specific/linux/libvolume_id/default.nix
+++ b/pkgs/os-specific/linux/libvolume_id/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
    
 stdenv.mkDerivation {
-  name = "libvolume_id-0.75.0";
+  name = "libvolume_id-0.81.0";
    
   src = fetchurl {
-    url = http://www.marcuscom.com/downloads/libvolume_id-0.75.0.tar.bz2;
-    sha256 = "1n1ji2jz45ncvyv529nz8xwcz058z9z98970v9h2wwwg8ra2a1sl";
+    url = http://www.marcuscom.com/downloads/libvolume_id-0.81.0.tar.bz2;
+    sha256 = "1dpmp1kb40kb1jxj6flpi37wy789wf91dm4bax6jspd1jdc6hsrg";
   };
 
   preBuild = "