diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 6f8b92d7a34b..80fcfd5a0add 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -51,6 +51,17 @@ in }; }) { } ); + julia_112-bin = wrapJulia ( + callPackage (import ./generic-bin.nix { + version = "1.12.1"; + sha256 = { + x86_64-linux = "7d2add9ee74ee2f12b5c268bc194794cc52ea440f8687fbab29db6afefbf69b7"; + aarch64-linux = "2e3d6ca07e251721fa3e0cd3460fc240e60f2a9bd97bae0ea2144f586da19297"; + x86_64-darwin = "7dd841cd853ad64f5e90a4b459631b49ee388891ceaba81857f5b8959392c4b2"; + aarch64-darwin = "cc65620b71a725380e59d0e31dc0b4140f30229b70a4b8eec8e32c222bc54fc1"; + }; + }) { } + ); julia_19 = wrapJulia ( callPackage (import ./generic.nix { version = "1.9.4"; @@ -86,4 +97,13 @@ in ]; }) { } ); + julia_112 = wrapJulia ( + callPackage (import ./generic.nix { + version = "1.12.1"; + hash = "sha256-iR0Wu5HIqU1aY1WoLBf6PCRY64kWDUKEQ6CyobhB6lI="; + patches = [ + ./patches/1.12/0001-skip-failing-and-flaky-tests.patch + ]; + }) { } + ); } diff --git a/pkgs/development/compilers/julia/generic-bin.nix b/pkgs/development/compilers/julia/generic-bin.nix index b6622dfc4b3d..5190ba3226bf 100644 --- a/pkgs/development/compilers/julia/generic-bin.nix +++ b/pkgs/development/compilers/julia/generic-bin.nix @@ -15,9 +15,6 @@ let skip_tests = [ # Test flaky on ofborg "channels" - # Test flaky because of our RPATH patching - # https://github.com/NixOS/nixpkgs/pull/230965#issuecomment-1545336489 - "compiler/codegen" # Test flaky "read" ] @@ -34,6 +31,16 @@ let "loading" "cmdlineargs" ] + ++ lib.optionals (lib.versionAtLeast version "1.12") [ + # Test flaky because of our RPATH patching + # https://github.com/NixOS/nixpkgs/pull/230965#issuecomment-1545336489 + "Compiler/codegen" + "precompile" + "compileall" + ] + ++ lib.optionals (lib.versionOlder version "1.12") [ + "compiler/codegen" # older versions' test was in lowercase + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Test flaky on ofborg "FileWatching" diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix index 469e0206514d..f1ef721d346c 100644 --- a/pkgs/development/compilers/julia/generic.nix +++ b/pkgs/development/compilers/julia/generic.nix @@ -60,6 +60,11 @@ stdenv.mkDerivation rec { substituteInPlace deps/curl.mk \ --replace-fail 'cd $(dir $<) && $(TAR) jxf $(notdir $<)' \ 'cd $(dir $<) && $(TAR) jxf $(notdir $<) && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" curl-$(CURL_VER)/scripts/cd2nroff' + '' + + lib.optionalString (lib.versionAtLeast version "1.12") '' + substituteInPlace deps/openssl.mk \ + --replace-fail 'cd $(dir $<) && $(TAR) -zxf $<' \ + 'cd $(dir $<) && $(TAR) -zxf $< && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" openssl-$(OPENSSL_VER)/Configure' ''; makeFlags = [ diff --git a/pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch b/pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch new file mode 100644 index 000000000000..4ab76c9fa642 --- /dev/null +++ b/pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch @@ -0,0 +1,25 @@ +From e26b82d0c162b6c22b65b2a5d2cd03d98fd9f5d4 Mon Sep 17 00:00:00 2001 +From: Sergey Volkov +Date: Thu, 9 Oct 2025 13:00:31 +0200 +Subject: [PATCH] disable failing and flaky tests + +--- + test/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/Makefile b/test/Makefile +index 69b7ad1451..583e64a287 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -30,7 +30,7 @@ default: + + $(TESTS): + @cd $(SRCDIR) && \ +- $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@) ++ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip NetworkOptions REPL channels FileWatching ccall loading cmdlineargs Distributed precompile compileall $@) + + $(addprefix revise-, $(TESTS)): revise-% : + @cd $(SRCDIR) && \ +-- +2.51.0 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f7d72bf5914..abeaa1582649 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5136,17 +5136,19 @@ with pkgs; julia_19-bin julia_110-bin julia_111-bin + julia_112-bin julia_19 julia_110 julia_111 + julia_112 ; julia-lts = julia_110-bin; - julia-stable = julia_111; + julia-stable = julia_112; julia = julia-stable; julia-lts-bin = julia_110-bin; - julia-stable-bin = julia_111-bin; + julia-stable-bin = julia_112-bin; julia-bin = julia-stable-bin; kotlin = callPackage ../development/compilers/kotlin { };