Merge pull request #104166 from doronbehar/pkg/julia/cleanup
julia: Disable tests for 1.3.1, and make 1.5.3 the default
This commit is contained in:
commit
ec695db02f
@ -72,13 +72,15 @@ stdenv.mkDerivation rec {
|
||||
makeFlags =
|
||||
let
|
||||
arch = head (splitString "-" stdenv.system);
|
||||
march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch}
|
||||
march = {
|
||||
x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64";
|
||||
i686 = "pentium4";
|
||||
aarch64 = "armv8-a";
|
||||
}.${arch}
|
||||
or (throw "unsupported architecture: ${arch}");
|
||||
# Julia requires Pentium 4 (SSE2) or better
|
||||
cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch}
|
||||
cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch}
|
||||
or (throw "unsupported architecture: ${arch}");
|
||||
# Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM
|
||||
# https://github.com/JuliaLang/julia/tree/master/deps/patches
|
||||
in [
|
||||
"ARCH=${arch}"
|
||||
"MARCH=${march}"
|
||||
@ -119,7 +121,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
# Other versions of Julia pass the tests, but we are not sure why these fail.
|
||||
doCheck = false;
|
||||
checkTarget = "testall";
|
||||
# Julia's tests require read/write access to $HOME
|
||||
preCheck = ''
|
||||
|
@ -9538,10 +9538,8 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
|
||||
};
|
||||
|
||||
|
||||
|
||||
julia_1 = julia_10;
|
||||
julia = julia_1;
|
||||
julia = julia_15;
|
||||
|
||||
jwasm = callPackage ../development/compilers/jwasm { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user