From bed5e75287ba700d2b9a3faa748e0eea1b0ebb69 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 28 Nov 2022 19:35:28 +0000 Subject: [PATCH] julia: backport test tweak for mpfr-4.1.1 Without the change `julia` test fails on `staging-next` as: Error in testset MPFR_jll: Test Failed at /build/julia-1.8.3/usr/share/julia/stdlib/v1.8/MPFR_jll/test/runtests.jl:7 Expression: vn == v"4.1.0" Evaluated: v"4.1.1" == v"4.1.0" ERROR: LoadError: Test run finished with errors --- pkgs/development/compilers/julia/1.8.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/compilers/julia/1.8.nix b/pkgs/development/compilers/julia/1.8.nix index f8b0daa1ace7..1c614103bdec 100644 --- a/pkgs/development/compilers/julia/1.8.nix +++ b/pkgs/development/compilers/julia/1.8.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , which , python3 , gfortran @@ -40,6 +41,15 @@ stdenv.mkDerivation rec { path = name: "https://raw.githubusercontent.com/archlinux/svntogit-community/6fd126d089d44fdc875c363488a7c7435a223cec/trunk/${name}"; in [ + # Pull upstream fix to fix tests mpfr-4.1.1 + # https://github.com/JuliaLang/julia/pull/47659 + (fetchpatch { + name = "mfr-4.1.1.patch"; + url = "https://github.com/JuliaLang/julia/commit/59965205ccbdffb4e25e1b60f651ca9df79230a4.patch"; + hash = "sha256-QJ5wxZMhz+or8BqcYv/5fNSTxDAvdSizTYqt7630kcw="; + includes = [ "stdlib/MPFR_jll/test/runtests.jl" ]; + }) + (fetchurl { url = path "julia-hardcoded-libs.patch"; sha256 = "sha256-kppSpVA7bRohd0wXDs4Jgct9ocHnpbeiiSz7ElFom1U=";