Remove HAL

It's obsolete.  There was only one package still using it (nut) but it
builds fine without it.

6 files changed, 3 insertions, 127 deletions

diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix
index 3d4e5136021..51ae8633a7c 100644
--- a/pkgs/applications/misc/nut/default.nix
+++ b/pkgs/applications/misc/nut/default.nix
@@ -1,13 +1,14 @@
-{stdenv, fetchurl, pkgconfig, neon, libusb, hal, openssl, udev}:
+{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev }:
 
 stdenv.mkDerivation {
   name = "nut-2.6.1";
+
   src = fetchurl {
     url = http://www.networkupstools.org/source/2.6/nut-2.6.1.tar.gz;
     sha256 = "f5c46b856c0cf5b7f0e4b22d82b670af64cc98717a90eaac8723dd402a181c00";
   };
 
-  buildInputs = [pkgconfig neon libusb hal openssl udev];
+  buildInputs = [ pkgconfig neon libusb openssl udev ];
 
   configureFlags = [
     "--with-all"
diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix
deleted file mode 100644
index f1757be94cf..00000000000
--- a/pkgs/os-specific/linux/hal/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, python, pciutils, expat
-, libusb, dbus, dbus_glib, glib, libuuid, perl
-, perlXMLParser, gettext, zlib, gperf, consolekit, policykit
-, libsmbios, dmidecode, udev, utillinux, pmutils, usbutils
-, eject, upstart
-}:
-
-assert stdenv ? glibc;
-
-let
-  isPC = stdenv.isi686 || stdenv.isx86_64;
-  changeDmidecode = if isPC then
-    "--replace /usr/sbin/dmidecode ${dmidecode}/sbin/dmidecode"
-    else "";
-in
-stdenv.mkDerivation rec {
-  name = "hal-0.5.14";
-
-  src = fetchurl {
-    url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "00ld3afcbh4ckb8sli63mm2w69zh6ip4axhy1lxyybgiabxaqfij";
-  };
-
-  buildInputs = [
-    pkgconfig python pciutils expat libusb dbus.libs dbus_glib glib
-    libuuid perl perlXMLParser gettext zlib gperf
-    consolekit policykit
-  ];
-
-  # !!! Hm, maybe the pci/usb.ids location should be in /etc, so that
-  # we don't have to rebuild HAL when we update the PCI/USB IDs.
-  configureFlags = ''
-    --with-pci-ids=${pciutils}/share
-    --with-usb-ids=${usbutils}/share
-    --localstatedir=/var
-    --with-eject=${eject}/bin/eject
-    --with-linux-input-header=${stdenv.glibc}/include/linux/input.h
-    --enable-umount-helper
-  '';
-
-  propagatedBuildInputs = [ libusb ]
-    ++ stdenv.lib.optional isPC libsmbios;
-
-  preConfigure = ''
-    for i in hald/linux/probing/probe-smbios.c hald/linux/osspec.c \
-             hald/linux/coldplug.c hald/linux/blockdev.c \
-             tools/hal-storage-mount.c ./tools/hal-storage-shared.c \
-             tools/hal-system-power-pm-is-supported.c \
-             tools/linux/hal-*-linux
-    do
-      substituteInPlace $i \
-        ${changeDmidecode} \
-        ${if udev != null then "--replace /sbin/udevadm ${udev}/sbin/udevadm" else ""} \
-        --replace /bin/mount ${utillinux}/bin/mount \
-        --replace /bin/umount ${utillinux}/bin/umount \
-        --replace /usr/bin/pm-is-supported ${pmutils}/bin/pm-is-supported \
-        --replace /usr/sbin/pm ${pmutils}/sbin/pm \
-        --replace /sbin/shutdown ${upstart}/sbin/shutdown
-    done
-  '';
-
-  installFlags = "slashsbindir=$(out)/sbin";
-}
diff --git a/pkgs/os-specific/linux/hal/hal-evt.nix b/pkgs/os-specific/linux/hal/hal-evt.nix
deleted file mode 100644
index a49f4fcc0f8..00000000000
--- a/pkgs/os-specific/linux/hal/hal-evt.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, libxml2, pkgconfig, boolstuff, hal, dbus_glib }:
-
-stdenv.mkDerivation {
-  name = "hal-evt-0.1.4";
-
-  src = fetchurl {
-    url = http://savannah.nongnu.org/download/halevt/halevt-0.1.4.tar.gz;
-    sha256 = "173dphyzpicjz5pnw0d6wmibvib5h99nh1gmyvcqpgvf8la5vrps";
-  };
-
-  buildInputs = [ libxml2 pkgconfig boolstuff hal dbus_glib ];
-
-  meta = { 
-    description = "Execute commands on hal events";
-    homepage = http://www.nongnu.org/halevt/;
-    license = "GPLv2";
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/os-specific/linux/hal/info.nix b/pkgs/os-specific/linux/hal/info.nix
deleted file mode 100644
index 1a4e41c776f..00000000000
--- a/pkgs/os-specific/linux/hal/info.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, pkgconfig}:
-
-stdenv.mkDerivation rec {
-  name = "hal-info-20091130";
-  
-  src = fetchurl {
-    url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "092jhzpxa2h8djf8pijql92m70q87yds22686ryrfna3xbm90niv";
-  };
-
-  meta = {
-    homepage = http://www.freedesktop.org/wiki/Software/hal;
-    description = "Hardware data and quirks for HAL";
-  };
-}
diff --git a/pkgs/os-specific/linux/hal/synaptics.nix b/pkgs/os-specific/linux/hal/synaptics.nix
deleted file mode 100644
index 20c4d1ec24f..00000000000
--- a/pkgs/os-specific/linux/hal/synaptics.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv}:
-stdenv.mkDerivation {
-  name = "hal-info-synaptics";
-  buildCommand = ''
-    mkdir -p $out/share/hal/fdi/information/15-osvendor/
-    cat << EOF > $out/share/hal/fdi/information/15-osvendor/10-x11-synaptics.fdi
-<?xml version="1.0" encoding="UTF-8"?>
-       <deviceinfo version="0.2">
-           <device>
-               <match key="info.capabilities" contains="input.touchpad">
-                   <merge key="input.x11_driver" type="string">synaptics</merge>
-                   <merge key="input.x11_options.AlwaysCore" type="string">true</merge>
-                   <merge key="input.x11_options.Protocol" type="string">event</merge>
-               </match>
-           </device>
-       </deviceinfo>
-EOF
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b68f0e44da..64b8eeaff51 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5624,14 +5624,6 @@ let
 
   gpm = callPackage ../servers/gpm { };
 
-  hal = callPackage ../os-specific/linux/hal { };
-
-  halevt = callPackage ../os-specific/linux/hal/hal-evt.nix { };
-
-  hal_info = callPackage ../os-specific/linux/hal/info.nix { };
-
-  hal_info_synaptics = callPackage ../os-specific/linux/hal/synaptics.nix { };
-
   hdparm = callPackage ../os-specific/linux/hdparm { };
 
   hibernate = callPackage ../os-specific/linux/hibernate { };