svn merge ^/nixpkgs/trunk, one simple conflict in jruby

svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
parent 3980444b2b b94fef3cba
commit 84c0185038
69 changed files with 763 additions and 352 deletions
@@ -33,7 +33,7 @@ rec {

  doEnsureBtrfsImage = a.fullDepEntry (''
    if ! grep 'progs = ' Makefile | grep btrfs-image; then
-      sed -e 's/progs = .*/& btrfs-image/' -i Makefile
+      sed -e 's/progs = \(.*\)\\/progs = \1btrfs-image \\/' -i Makefile
    fi
  '') ["minInit" "doUnpack"];