Merge pull request #121114 from samuela/patch-2

authored by Sandro and committed by GitHub db2166a2 f2f00af5

+10 -16
+10 -16
pkgs/development/compilers/julia/1.5.nix
··· 38 38 39 39 postPatch = '' 40 40 patchShebangs . contrib 41 - for i in backtrace cmdlineargs; do 42 - mv test/$i.jl{,.off} 43 - touch test/$i.jl 44 - done 45 - rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl 46 - rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl 47 - # LibGit2 fails with a weird error, so we skip it as well now 48 - rm stdlib/LibGit2/test/runtests.jl && touch stdlib/LibGit2/test/runtests.jl 49 - sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl 50 - sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl 51 41 ''; 52 42 53 43 dontUseCmakeConfigure = true; ··· 112 102 openspecfun pcre2 lapack 113 103 ]; 114 104 115 - # Julia's tests require read/write access to $HOME 116 - preCheck = '' 117 - export HOME="$NIX_BUILD_TOP" 118 - ''; 119 - 120 105 preBuild = '' 121 106 sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile 122 107 sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile ··· 124 109 ''; 125 110 126 111 enableParallelBuilding = true; 112 + 113 + # Julia's tests require read/write access to $HOME 114 + preCheck = '' 115 + export HOME="$NIX_BUILD_TOP" 116 + ''; 117 + doCheck = true; 118 + checkTarget = "test"; 127 119 128 120 postInstall = '' 129 121 # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, ··· 148 140 license = lib.licenses.mit; 149 141 maintainers = with lib.maintainers; [ raskin rob garrison ]; 150 142 platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; 151 - broken = stdenv.isi686; 143 + # Unfortunately, this derivation does not pass Julia's test suite. See 144 + # https://github.com/NixOS/nixpkgs/pull/121114. 145 + broken = true; 152 146 }; 153 147 }