From f99dc0652eb0110395c7629cfd4f2ee1531172ad Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Fri, 10 Oct 2025 10:07:56 +0200 Subject: [PATCH] julia_112: init at 1.12.1 --- pkgs/development/compilers/julia/default.nix | 9 +++++++ pkgs/development/compilers/julia/generic.nix | 5 ++++ .../0001-skip-failing-and-flaky-tests.patch | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 4013c2196cf6..80fcfd5a0add 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -97,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.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 c8dc5dce144a..ba165a8c4f3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5184,10 +5184,11 @@ with pkgs; 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;