svn merge ^/nixpkgs/trunk

A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
parent 0b90cd41b2 47288a2224
commit 9ee0a9df9b
237 changed files with 3563 additions and 688 deletions
@@ -26,6 +26,8 @@ stdenv.mkDerivation {
    done
    chmod +w -R *
    sed -i -e 's/console=ttyS0,57600n8//' include/configs/qi_lb60.h
+    # Load more than 2MiB for the kernel
+    sed -i -e 's/0x200000;bootm/0x400000;bootm/' include/configs/qi_lb60.h
  '';

  # Remove the cross compiler prefix, and add reiserfs support