Merge branch 'master' into staging

Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:32:23 +01:00
parent 5dab625862 b50cabf2d4
commit dbae4f109f
564 changed files with 41840 additions and 27780 deletions
--- a/pkgs/development/compilers/julia/0.2.1.nix
+++ b/pkgs/development/compilers/julia/0.2.1.nix
--- a/pkgs/development/compilers/julia/0.3.5.nix
+++ b/pkgs/development/compilers/julia/0.3.5.nix
@@ -140,6 +140,9 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

+  doCheck = true;
+  checkTarget = "testall";
+
  meta = {
    description = "High-level performance-oriented dynamical language for technical computing";
    homepage = "http://julialang.org/";