diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.3.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.3.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.3.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.3.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.3.nix index 15694734d487..406ea73f2aed 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.3.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.3.nix @@ -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 = '' |