gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

julia_112{,-bin}: init at 1.12.1 (#450240)

Browse Source
This commit is contained in:
Weijia Wang
2025-10-23 18:03:50 +00:00
committed by GitHub
parent c108dbf975 f99dc0652e
commit 0f00965306
5 changed files with 64 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/julia/default.nix
+20
View File
@@ -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
];
}) { }
);
}
pkgs/development/compilers/julia/generic-bin.nix
+10 -3
View File
@@ -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"
pkgs/development/compilers/julia/generic.nix
+5
View File
@@ -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 = [
pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch
+25
View File
@@ -0,0 +1,25 @@
From e26b82d0c162b6c22b65b2a5d2cd03d98fd9f5d4 Mon Sep 17 00:00:00 2001
From: Sergey Volkov <taranarmo@gmail.com>
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
pkgs/top-level/all-packages.nix
+4 -2
View File
@@ -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 { };