diff options
Diffstat (limited to 'pkgs/development/compilers/julia')
| -rw-r--r-- | pkgs/development/compilers/julia/1.8-bin.nix (renamed from pkgs/development/compilers/julia/1.7-bin.nix) | 18 | ||||
| -rw-r--r-- | pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch | 30 |
2 files changed, 3 insertions, 45 deletions
diff --git a/pkgs/development/compilers/julia/1.7-bin.nix b/pkgs/development/compilers/julia/1.8-bin.nix index 5352d38a221a..bd942d1bfe5f 100644 --- a/pkgs/development/compilers/julia/1.7-bin.nix +++ b/pkgs/development/compilers/julia/1.8-bin.nix @@ -2,29 +2,16 @@ stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.7.3"; + version = "1.8.0"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "0ff7ypr76xf99h3dmy1xdnkq2xn432qnzihxs72xrd4j5nhlybwv"; + sha256 = "sha256-6A1zLMt/eeAA15jLi2Vtw2QatZUW1uTlLhZ2UBeJKgA="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - # Julia’s source files are in different locations for source and binary - # releases. Thus we temporarily create a symlink to allow us to share patches - # with source releases. - prePatch = '' - ln -s share/julia/test - ''; - patches = [ - # Source release Nix patch(es) relevant for binary releases as well. - ./patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch - ]; postPatch = '' - # Revert symlink hack. - rm test - # Julia fails to pick up our Certification Authority root certificates, but # it provides its own so we can simply disable the test. Patching in the # dynamic path to ours require us to rebuild the Julia system image. @@ -46,6 +33,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; preInstallCheck = '' + export JULIA_TEST_USE_MULTIPLE_WORKERS=true # Some tests require read/write access to $HOME. export HOME="$TMPDIR" ''; diff --git a/pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch b/pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch deleted file mode 100644 index 243a9cfd76ae..000000000000 --- a/pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 44c2c979c4f2222567ce65f506cf47fb87482348 Mon Sep 17 00:00:00 2001 -From: Pontus Stenetorp <pontus@stenetorp.se> -Date: Thu, 8 Apr 2021 04:37:44 +0000 -Subject: [PATCH 5/6] nix: Enable parallel unit tests for sandbox - -Disabled by default due to lack of networking in the Nix sandbox. This -greatly speeds up the build process on a multi-core system. ---- - test/runtests.jl | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/test/runtests.jl b/test/runtests.jl -index 2f9cd058bb..2f8c19fa32 100644 ---- a/test/runtests.jl -+++ b/test/runtests.jl -@@ -83,8 +83,9 @@ prepend!(tests, linalg_tests) - import LinearAlgebra - cd(@__DIR__) do - n = 1 -- if net_on -- n = min(Sys.CPU_THREADS, length(tests)) -+ if net_on || haskey(ENV, "NIX_BUILD_CORES") -+ x = haskey(ENV, "NIX_BUILD_CORES") ? parse(Int, ENV["NIX_BUILD_CORES"]) : Sys.CPU_THREADS -+ n = min(x, Sys.CPU_THREADS, length(tests)) - n > 1 && addprocs_with_testenv(n) - LinearAlgebra.BLAS.set_num_threads(1) - end --- -2.29.3 - |