Merge recent staging built on Hydra

http://hydra.nixos.org/eval/1231884 Only Darwin jobs seem to be queued now, but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
parent b1dca6ca88 c20b6846f2
commit 263fd55d4b
68 changed files with 621 additions and 275 deletions
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -23,6 +23,7 @@ let
      sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5";
    };
    armv6l-linux = armv7l-linux;
+    x86_64-solaris = x86_64-linux;
  };
  cfg = options.${stdenv.system};
 in