diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 5cc3ef8af959..126db28f0fc9 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 { }; @@ -27,12 +32,12 @@ in ); julia_111-bin = wrapJulia ( callPackage (import ./generic-bin.nix { - version = "1.11.7"; + version = "1.11.8"; sha256 = { - x86_64-linux = "aa5924114ecb89fd341e59aa898cd1882b3cb622ca4972582c1518eff5f68c05"; - aarch64-linux = "f97f80b35c12bdaf40c26f6c55dbb7617441e49c9e6b842f65e8410a388ca6f4"; - x86_64-darwin = "b2c11315df39da478ab0fa77fb228f3fd818f1eaf42dc5cc1223c703f7122fe5"; - aarch64-darwin = "74df9d4755a7740d141b04524a631e2485da9d65065d934e024232f7ba0790b6"; + x86_64-linux = "26ad9031b0c9857cde8c89aced86990d1842a551940bfb275e8372108e57cc50"; + aarch64-linux = "54c8f866e1317fa249df47bde535fb4dda7c620863e8f877a1c91d6ed241f11a"; + x86_64-darwin = "b54fd6e6d06fc8ae138dbd556d34d6bf89d91025b725349ab88c83bf958f8557"; + aarch64-darwin = "c54daf1eea4c66d831d29ff0c40d629891474bc57391db3b3a2e56d06390bc38"; }; }) { } ); @@ -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.7"; - hash = "sha256-puluy9YAV8kdx6mfwbN1F7Nhot+P0cRv/a0dm86Jln0="; - }) { } + callPackage + (import ./generic.nix { + version = "1.11.8"; + hash = "sha256-ACblvJzyoRlzaWMZL/1ieF4izdNuhCvYgxvPrtCyJBo="; + }) + { + stdenv = gcc14Stdenv; + gfortran = gfortran14; + } ); julia_112 = wrapJulia ( callPackage (import ./generic.nix {