Merge 'staging' into closure-size

This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:35:03 +02:00
parent 056b5a1a5f c55cfe0cb3
commit d1df28f8e5
89 changed files with 1475 additions and 397 deletions
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -35,6 +35,9 @@ stdenv.mkDerivation rec {

    # Bug fix backported from binutils master.
    ./fix-bsymbolic.patch
+
+   # Bug fix backported from binutils master.
+    ./fix-update-symbol-version.patch
  ];

  outputs = (optional (cross == null) "dev") ++ [ "out" "info" ];