Various.. Added ircd-hybrid. Added USB support in SANE. Added Xsane. Added gt68xx firmware support.

svn path=/nixpkgs/trunk/; revision=9070

pkgs/misc/sane-backends/default.nix

@@ -1,4 +1,5 @@
-{stdenv, fetchurl, hotplugSupport ? false}:
+{stdenv, fetchurl, hotplugSupport ? false, libusb ? null,
+	gt68xxFirmware ? null}:
 
 assert hotplugSupport -> stdenv.system == "i686-linux";
 
@@ -10,4 +11,11 @@ stdenv.mkDerivation {
     md5 = "7ca7e2908e24721471de92cf40c75e60";
   };
   udevSupport = hotplugSupport;
+
+  buildInputs = (if libusb != null then [libusb] else []);
+
+  preInstall = (if gt68xxFirmware != null then 
+	"mkdir -p \${out}/share/sane/gt68xx ; ln -s " +  
+	(gt68xxFirmware {inherit fetchurl;})+ " \${out}/share/sane/gt68xx/PS1fw.usb "
+	 else "");
 }

pkgs/misc/sane-front/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, saneBackends, libX11, gtk,
+	pkgconfig, libusb ? null}:
+stdenv.mkDerivation {
+  name = "sane-frontend";
+
+  src = fetchurl {
+    url = ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.14/sane-frontends-1.0.14.tar.gz;
+    md5 = "c63bf7b0bb5f530cf3c08715db721cd3";
+  };
+
+  buildInputs = [saneBackends libX11 gtk pkgconfig] ++ 
+	(if (libusb != null) then [libusb] else []);
+}

pkgs/misc/xsane/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, saneBackends, saneFrontends,
+	libX11, gtk, pkgconfig, libusb ? null}:
+stdenv.mkDerivation {
+  name = "xsane-0.97";
+
+  src = fetchurl {
+    url = ftp://ftp.sane-project.org/pub/sane/xsane/xsane-0.97.tar.gz;
+    md5 = "3d1f889d88c3462594febd53be58c561";
+  };
+
+  buildInputs = [saneBackends saneFrontends libX11 gtk pkgconfig ] ++
+	(if (libusb != null) then [libusb] else []);
+}

pkgs/servers/irc/ircd-hybrid/default.nix

@@ -0,0 +1,23 @@
+args:
+args.stdenv.mkDerivation {
+  name = "ircd-hybrid-7.2.2";
+
+  src = args.fetchurl {
+    url = http://prdownloads.sourceforge.net/ircd-hybrid/ircd-hybrid-7.2.2.tgz;
+    sha256 = "1xn4dfbgx019mhismfnr2idhslvarlajyahj7c6bqzmarcwwrvck";
+  };
+
+  buildInputs =(with args; [openssl zlib]);
+
+  configureFlags = (with args; ["--with-nicklen=100" 
+	"--with-topiclen=360" 
+	("--enable-openssl=" + openssl)]);
+
+  preInstall = "mkdir -p \${out}/ ; ln -s /home/ircd \${out}/logs;";
+
+  meta = {
+    description = "
+	An IPv6-capable IRC server.
+";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -2225,6 +2225,10 @@ rec {
     inherit fetchurl stdenv ;
   };
 
+  ircdHybrid = import ../servers/irc/ircd-hybrid {
+		inherit fetchurl stdenv openssl zlib;
+	};
+
   jetty = import ../servers/http/jetty {
     inherit fetchurl stdenv unzip;
   };
@@ -3630,7 +3634,16 @@ rec {
   };
 
   saneBackends = import ../misc/sane-backends {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv libusb;
+	gt68xxFirmware = 
+		getConfig ["sane" "gt68xxFirmware"] null;
+  };
+
+  saneFrontends = import ../misc/sane-front {
+    inherit fetchurl stdenv pkgconfig libusb
+	saneBackends;
+    inherit (gtkLibs) gtk;
+    inherit (xlibs) libX11;
   };
 
   synaptics = import ../misc/synaptics {
@@ -3677,4 +3690,12 @@ rec {
     inherit (gtkLibs) gtk;
   };*/
 
+  xsane = import ../misc/xsane {
+    inherit fetchurl stdenv pkgconfig libusb
+	saneBackends saneFrontends;
+    inherit (gtkLibs) gtk;
+    inherit (xlibs) libX11;
+  };
+
+
 }