Merge recent master into staging

Nixpkgs Hydra: ?compare=1157272 TODO: port e22889064f Conflicts: nixos/tests/gnome3_10.nix (auto-solved) pkgs/applications/video/aegisub/default.nix pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
parent c0e2aceef4 8e02bde1a8
commit 52404a868d
288 changed files with 8123 additions and 4307 deletions
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
  doCheck = false;

  meta = {
+    branch = "4";
    description = "GNU multiple precision arithmetic library";

    longDescription =