Merge trunk into branches/libpng15. No conflicts.

svn path=/nixpkgs/branches/libpng15/; revision=30917

4 files changed, 43 insertions, 11 deletions

diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 17755a17b7ba..2a6409a8fdd1 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -7,11 +7,11 @@ assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
 stdenv.mkDerivation rec {
-  name = "wine-1.3.29";
+  name = "wine-1.3.32";
 
   src = fetchurl {
     url = "mirror://sourceforge/wine/${name}.tar.bz2";
-    sha256 = "1mi4xzbpqmian9q5bs6df8b1mfgnnd4mlh0kb2ynbpk7kmx0zyj1";
+    sha256 = "fe1691ef8e9c5c4afeb345ad0f0b364d055cfe67a7e64b0a4a44da4d85cfa8b6";
   };
 
   gecko = fetchurl {
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix
index 65e748b68fcf..458985c61f73 100644
--- a/pkgs/misc/sane-backends/default.nix
+++ b/pkgs/misc/sane-backends/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, hotplugSupport ? false, libusb ? null
+{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null
 , gt68xxFirmware ? null }:
 let
   firmware = gt68xxFirmware {inherit fetchurl;};
 in
-assert hotplugSupport -> stdenv.system == "i686-linux";
+assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
 
 stdenv.mkDerivation {
   name = "sane-backends-1.0.21";
@@ -20,6 +20,7 @@ stdenv.mkDerivation {
   postInstall = ''
     if test "$udevSupport" = "1"; then
       ensureDir $out/etc/udev/rules.d/
+      ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
       cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
     fi
   '';
diff --git a/pkgs/misc/sane-backends/snapshot.nix b/pkgs/misc/sane-backends/snapshot.nix
new file mode 100644
index 000000000000..8725206ddce3
--- /dev/null
+++ b/pkgs/misc/sane-backends/snapshot.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null
+, gt68xxFirmware ? null }:
+let
+  firmware = gt68xxFirmware {inherit fetchurl;};
+in
+assert hotplugSupport -> stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+  name = "sane-backends-1.0.22.git201111204";
+  
+  src = fetchurl {
+    url = http://www.sane-project.org/snapshots/sane-backends-git20111204.tar.gz;
+    sha256 = "00b3fi8zjrq3in0wndz1xcz228mgfhwhh2knmyjsikr88hal0m47";
+  };
+  
+  udevSupport = hotplugSupport;
+
+  buildInputs = if libusb != null then [libusb] else [];
+
+  postInstall = ''
+    if test "$udevSupport" = "1"; then
+      ensureDir $out/etc/udev/rules.d/
+      ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
+      cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
+    fi
+  '';
+
+  preInstall =
+    if gt68xxFirmware != null then 
+      "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
+      " \${out}/share/sane/gt68xx/" + firmware.name
+    else "";
+}
diff --git a/pkgs/misc/tex/dblatex/default.nix b/pkgs/misc/tex/dblatex/default.nix
index 911c461bfbaa..05f4bd7a9fa1 100644
--- a/pkgs/misc/tex/dblatex/default.nix
+++ b/pkgs/misc/tex/dblatex/default.nix
@@ -1,20 +1,18 @@
-{stdenv, fetchurl, python, libxslt, tetex}:
+{ stdenv, fetchurl, python, libxslt, tetex }:
 
 stdenv.mkDerivation rec {
-  name = "dblatex-0.2.12";
+  name = "dblatex-0.3.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/dblatex/${name}.tar.bz2";
-    sha256 = "1wjghrlcn7hkr70nnyzzag1z57l5b1ck8i3r8zl7bw2rsrvqmyz2";
+    sha256 = "0jg2acv2lyrbw06l8rr0id75lj1pws7xbsmryq58r3n13xzb1p7b";
   };
 
   buildPhase = "true";
   
-  installPhase = "
-    python ./setup.py install --prefix=$out
-  ";
+  installPhase = "python ./setup.py install --prefix=$out";
 
-  buildInputs = [python libxslt tetex];
+  buildInputs = [ python libxslt tetex ];
 
   meta = {
     description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt";