svn merge ^/nixpkgs/trunk

A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434

6 files changed, 67 insertions, 20 deletions

diff --git a/pkgs/os-specific/linux/fbterm/src-for-default.nix b/pkgs/os-specific/linux/fbterm/src-for-default.nix
index 39aaa2ca626..6705404ac9f 100644
--- a/pkgs/os-specific/linux/fbterm/src-for-default.nix
+++ b/pkgs/os-specific/linux/fbterm/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.5";
-   name="fbterm-1.5";
-   hash="05qzc6g9a79has3cy7dlw70n4pn13r552a2i1g4xy23acnpvvjsb";
+   version="1.7";
+   name="fbterm-1.7";
+   hash="19qjb2zb4gwr1jlybmalaw3y3zybvc8vliwj85dfabmill1k1afh";
    url="http://fbterm.googlecode.com/files/fbterm-${version}.tar.gz";
-   advertisedUrl="http://fbterm.googlecode.com/files/fbterm-1.5.tar.gz";
+   advertisedUrl="http://fbterm.googlecode.com/files/fbterm-1.7.tar.gz";
   
   
 }
diff --git a/pkgs/os-specific/linux/fbterm/stdenv.nix b/pkgs/os-specific/linux/fbterm/stdenv.nix
index 893dba11b60..e257a7d46eb 100644
--- a/pkgs/os-specific/linux/fbterm/stdenv.nix
+++ b/pkgs/os-specific/linux/fbterm/stdenv.nix
@@ -3,9 +3,9 @@
 { stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses }:
 
 let
-  version="1.5";
-  name="fbterm-1.5";
-  hash="05qzc6g9a79has3cy7dlw70n4pn13r552a2i1g4xy23acnpvvjsb";
+  version="1.7";
+  name="fbterm-1.7";
+  hash="19qjb2zb4gwr1jlybmalaw3y3zybvc8vliwj85dfabmill1k1afh";
   url="http://fbterm.googlecode.com/files/fbterm-${version}.tar.gz";
 in
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   buildNativeInputs = [ ncurses ];
   buildInputs = [ gpm freetype fontconfig pkgconfig ];
 
-  patchPhase = ''
+  preConfigure = ''
     sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp
 
     sed -e '/install-exec-hook:/,/^[^\t]/{d}; /.NOEXPORT/iinstall-exec-hook:\
diff --git a/pkgs/os-specific/linux/firmware/ralink/default.nix b/pkgs/os-specific/linux/firmware/ralink/default.nix
new file mode 100644
index 00000000000..23513d2bf88
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/ralink/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchsvn }:
+
+# Upstream is http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+
+stdenv.mkDerivation {
+  name = "ralink-fw-r17279";
+
+  src = fetchsvn {
+    url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/ralink;
+    rev = 17279;
+    sha256 = "06nc6w3xcrxzcai7gaf27k0v8k2xbq3imzpgc02rbxv5q5flxh65";
+  };
+
+  unpackPhase = "true";
+  
+  buildPhase = "true";
+
+  # Installation copies the firmware AND the license.  The license
+  # says: "Your rights to redistribute the Software shall be
+  # contingent upon your installation of this Agreement in its
+  # entirety in the same directory as the Software."
+  installPhase = ''
+    ensureDir $out
+    cp $src/*.bin $out
+    cp $src/LICENSE $out/ralink.LICENSE
+  '';
+  
+  meta = {
+    description = "Firmware for the Ralink wireless cards";
+    homepage = http://www.ralinktech.com/;
+    license = "non-free";
+  };
+}
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 4b8583dcc95..ba32362b6e8 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -1,4 +1,5 @@
-{ stdenv, kernel, elfutils }:
+{ stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto
+, docbook_xsl, docbook_xml_dtd_45, libxslt }:
 
 stdenv.mkDerivation {
   name = "perf-linux-${kernel.version}";
@@ -7,10 +8,25 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     cd tools/perf
-    export makeFlags="DESTDIR=$out"
+    sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
+    export makeFlags="DESTDIR=$out $makeFlags"
   '';
 
-  buildInputs = [ elfutils ];
+  # perf refers both to newt and slang
+  buildNativeInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ];
+  buildInputs = [ elfutils python perl newt slang ];
+
+  installFlags = "install install-man ASCIIDOC8=1";
+
+  inherit elfutils;
+
+  crossAttrs = {
+    /* I don't want cross-python or cross-perl -
+       I don't know if cross-python even works */
+    propagatedBuildInputs = [ elfutils.hostDrv newt.hostDrv ];
+    makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-";
+    elfutils = elfutils.hostDrv;
+  };
 
   meta = {
     homepage = https://perf.wiki.kernel.org/;
diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix
index 05137acc043..d26617d8e66 100644
--- a/pkgs/os-specific/linux/pam_usb/default.nix
+++ b/pkgs/os-specific/linux/pam_usb/default.nix
@@ -5,12 +5,12 @@ let
   pumountBin = useSetUID pmount "/bin/pumount";
 in
 
-stdenv.mkDerivation {
-  name = "pam_usb-0.4.2";
+stdenv.mkDerivation rec {
+  name = "pam_usb-0.5.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/pamusb/pam_usb/pam_usb-0.4.2/pam_usb-0.4.2.tar.gz;
-    sha256 = "736afced7482c7c5d47127285f7defe0a304a6136a0090588fa8698d385ba202";
+    url = "mirror://sourceforge/pamusb/${name}.tar.gz";
+    sha256 = "1g1w0s9d8mfld8abrn405ll5grv3xgs0b0hsganrz6qafdq9j7q1";
   };
 
   buildInputs = [
diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix
index af2078b676a..4d555f59c37 100644
--- a/pkgs/os-specific/linux/pmount/default.nix
+++ b/pkgs/os-specific/linux/pmount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cryptsetup, dbus, dbus_glib, hal, intltool, ntfs3g, utillinux
+{ stdenv, fetchurl, cryptsetup, dbus, dbus_glib, intltool, ntfs3g, utillinux
 , mediaDir ? "/media/"
 , lockDir ? "/var/lock/pmount"
 , whiteList ? "/etc/pmount.allow"
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036";
   };
 
-  buildInputs = [ hal intltool utillinux ];
+  buildInputs = [ intltool utillinux ];
 
   configureFlags = ""
   + " --with-media-dir=${mediaDir}"
@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
   + " --with-whitelist=${whiteList}"
   + " --with-mount-prog=${utillinux}/bin/mount"
   + " --with-umount-prog=${utillinux}/bin/umount"
-  + " --with-cryptsetup=${cryptsetup}/sbin/cryptsetup"
-  + " --with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g"
-  + " --enable-hal";
+  + " --with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g";
 
   postConfigure = ''
     # etc/Mafile.am is hardcoded and it does not respect the --prefix option.