diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 6a807e834ece..6f6bbf30cf0a 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,4 +1,9 @@ -{ callPackage, fetchpatch2 }: +{ + callPackage, + fetchpatch2, + gcc14Stdenv, + gfortran14, +}: let juliaWithPackages = callPackage ../../julia-modules { }; @@ -48,26 +53,36 @@ in }) { } ); julia_110 = wrapJulia ( - callPackage (import ./generic.nix { - version = "1.10.10"; - hash = "sha256-/NTIGLlcNu4sI1rICa+PS/Jn+YnWi37zFBcbfMnv3Ys="; - patches = [ - # Revert https://github.com/JuliaLang/julia/pull/55354 - # [build] Some improvements to the LLVM build system - # Related: https://github.com/JuliaLang/julia/issues/55617 - (fetchpatch2 { - url = "https://github.com/JuliaLang/julia/commit/0be37db8c5b5a440bd9a11960ae9c998027b7337.patch"; - revert = true; - hash = "sha256-gXC3LE3AuHMlSdA4dW+rbAhJpSB6ZMaz9X1qrHDPX7Y="; - }) - ]; - }) { } + callPackage + (import ./generic.nix { + version = "1.10.10"; + hash = "sha256-/NTIGLlcNu4sI1rICa+PS/Jn+YnWi37zFBcbfMnv3Ys="; + patches = [ + # Revert https://github.com/JuliaLang/julia/pull/55354 + # [build] Some improvements to the LLVM build system + # Related: https://github.com/JuliaLang/julia/issues/55617 + (fetchpatch2 { + url = "https://github.com/JuliaLang/julia/commit/0be37db8c5b5a440bd9a11960ae9c998027b7337.patch"; + revert = true; + hash = "sha256-gXC3LE3AuHMlSdA4dW+rbAhJpSB6ZMaz9X1qrHDPX7Y="; + }) + ]; + }) + { + stdenv = gcc14Stdenv; + gfortran = gfortran14; + } ); julia_111 = wrapJulia ( - callPackage (import ./generic.nix { - version = "1.11.8"; - hash = "sha256-ACblvJzyoRlzaWMZL/1ieF4izdNuhCvYgxvPrtCyJBo="; - }) { } + callPackage + (import ./generic.nix { + version = "1.11.8"; + hash = "sha256-ACblvJzyoRlzaWMZL/1ieF4izdNuhCvYgxvPrtCyJBo="; + }) + { + stdenv = gcc14Stdenv; + gfortran = gfortran14; + } ); julia_112 = wrapJulia ( callPackage (import ./generic.nix {