diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-05-25 02:30:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-25 02:30:22 +0200 |
| commit | db2166a2d32d88ee75827ef28622a3ce5bb329a7 (patch) | |
| tree | e010bd2d0433e409d863bbc6d10b62e4089692fb /pkgs/development/compilers/julia | |
| parent | f2f00af5b8e04a848c2b9ab8dcaf3e1c22a90dfb (diff) | |
| parent | 1e7f3bf0beae3c6fe916cc0a3e74391d79f98789 (diff) | |
Merge pull request #121114 from samuela/patch-2
Diffstat (limited to 'pkgs/development/compilers/julia')
| -rw-r--r-- | pkgs/development/compilers/julia/1.5.nix | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix index 271ea64a0948b..06c0e2a30e8c0 100644 --- a/pkgs/development/compilers/julia/1.5.nix +++ b/pkgs/development/compilers/julia/1.5.nix @@ -38,16 +38,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . contrib - for i in backtrace cmdlineargs; do - mv test/$i.jl{,.off} - touch test/$i.jl - done - rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl - rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl - # LibGit2 fails with a weird error, so we skip it as well now - rm stdlib/LibGit2/test/runtests.jl && touch stdlib/LibGit2/test/runtests.jl - sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl - sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl ''; dontUseCmakeConfigure = true; @@ -112,11 +102,6 @@ stdenv.mkDerivation rec { openspecfun pcre2 lapack ]; - # Julia's tests require read/write access to $HOME - preCheck = '' - export HOME="$NIX_BUILD_TOP" - ''; - preBuild = '' sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile @@ -125,6 +110,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Julia's tests require read/write access to $HOME + preCheck = '' + export HOME="$NIX_BUILD_TOP" + ''; + doCheck = true; + checkTarget = "test"; + postInstall = '' # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, # as using a wrapper with LD_LIBRARY_PATH causes segmentation @@ -148,6 +140,8 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ raskin rob garrison ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; - broken = stdenv.isi686; + # Unfortunately, this derivation does not pass Julia's test suite. See + # https://github.com/NixOS/nixpkgs/pull/121114. + broken = true; }; } |