From 9f8f053137668e607a15930d0db1a3d827ec93d5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 2 Dec 2024 14:18:18 -0500 Subject: [PATCH 1/5] julia_110-bin: 1.10.4 -> 1.10.7 --- pkgs/development/compilers/julia/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 68bd8497aad6d3..920aef2439975b 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -29,12 +29,12 @@ in { }); julia_110-bin = wrapJulia (callPackage (import ./generic-bin.nix { - version = "1.10.4"; + version = "1.10.7"; sha256 = { - x86_64-linux = "079f61757c3b5b40d2ade052b3cc4816f50f7ef6df668825772562b3746adff1"; - aarch64-linux = "ae4ae6ade84a103cdf30ce91c8d4035a0ef51c3e2e66f90a0c13abeb4e100fc4"; - x86_64-darwin = "259c18a5294dd41cc60117ecb9fc5a8b2f659807284903a65439fb9d3818c763"; - aarch64-darwin = "97b88d7f9b5724118769f3a3bd259f8f7ada48cdecf3d584cf68162dd873dd10"; + x86_64-linux = "21b2c69806aacf191d7c81806c7d9918bddab30c7b5b8d4251389c3abe274334"; + aarch64-linux = "93bf1b113f297c817310f77d1edce4ab9dcbf49432489cb8df09afbf93d1e5a0"; + x86_64-darwin = "4643d1052ed478b646be06f545b50698fbc572b216dcca3bca69f429ce0e1321"; + aarch64-darwin = "8beb61a29a6c32e26f55070dba8ded37f8572ad07aebd461a06ff5b10d48dc36"; }; }) { }); From d9fa300f8be0455d4fa4d5afaf0577593561a062 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 2 Dec 2024 14:20:21 -0500 Subject: [PATCH 2/5] julia_110: 1.10.4 -> 1.10.7 --- pkgs/development/compilers/julia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 920aef2439975b..61c95d3e36b877 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -60,8 +60,8 @@ in { }); julia_110 = wrapJulia (callPackage (import ./generic.nix { - version = "1.10.4"; - hash = "sha256-8y5Sd/XYKmOCSILN6/rBWBmbuEgUw8AZo/7MNgFYYZE="; + version = "1.10.7"; + hash = "sha256-BLo4KQstKnowOcMlHXClRRxP5ZXmTpl4rl7D+q+Fajw="; patches = [ ./patches/1.10/0002-skip-failing-and-flaky-tests.patch ]; From 79f1080f280cfd4ace4ff698652173fcb54916a5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 22 Jan 2025 17:07:04 -0500 Subject: [PATCH 3/5] julia_110-bin: 1.10.7 -> 1.10.8 --- pkgs/development/compilers/julia/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 61c95d3e36b877..ad859626c4c996 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -29,12 +29,12 @@ in { }); julia_110-bin = wrapJulia (callPackage (import ./generic-bin.nix { - version = "1.10.7"; + version = "1.10.8"; sha256 = { - x86_64-linux = "21b2c69806aacf191d7c81806c7d9918bddab30c7b5b8d4251389c3abe274334"; - aarch64-linux = "93bf1b113f297c817310f77d1edce4ab9dcbf49432489cb8df09afbf93d1e5a0"; - x86_64-darwin = "4643d1052ed478b646be06f545b50698fbc572b216dcca3bca69f429ce0e1321"; - aarch64-darwin = "8beb61a29a6c32e26f55070dba8ded37f8572ad07aebd461a06ff5b10d48dc36"; + x86_64-linux = "0410175aeec3df63173c15187f2083f179d40596d36fd3a57819cc5f522ae735"; + aarch64-linux = "8d63dd12595a08edc736be8d6c4fea1840f137b81c62079d970dbd1be448b8cd"; + x86_64-darwin = "8dae60def14db9e9b0f70891f15483d05785ae27a2c14f8f4b1ce27010e4015f"; + aarch64-darwin = "cdd5891a7b143bde835a79155471b82c5482d4dc5576f719351810548242e64b"; }; }) { }); From c806233552497c41cd4010f4820a31eccfc1ac40 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 22 Jan 2025 17:08:36 -0500 Subject: [PATCH 4/5] julia_110: 1.10.7 -> 1.10.8 --- pkgs/development/compilers/julia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index ad859626c4c996..50fbaacc0a1e0e 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -60,8 +60,8 @@ in { }); julia_110 = wrapJulia (callPackage (import ./generic.nix { - version = "1.10.7"; - hash = "sha256-BLo4KQstKnowOcMlHXClRRxP5ZXmTpl4rl7D+q+Fajw="; + version = "1.10.8"; + hash = "sha256-NPojubjOgy32CWlD/TDzI764Ca7cMsFj9r7vUdUW9Oc="; patches = [ ./patches/1.10/0002-skip-failing-and-flaky-tests.patch ]; From 237c868837e6a57e378b9f07630385194fb93c79 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 25 Jan 2025 14:04:47 -0500 Subject: [PATCH 5/5] julia_110: revert upstream commit breaking build --- pkgs/development/compilers/julia/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 50fbaacc0a1e0e..390745fe529069 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ callPackage, fetchpatch2 }: let juliaWithPackages = callPackage ../../julia-modules { }; @@ -64,6 +64,14 @@ in hash = "sha256-NPojubjOgy32CWlD/TDzI764Ca7cMsFj9r7vUdUW9Oc="; patches = [ ./patches/1.10/0002-skip-failing-and-flaky-tests.patch + # 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="; + }) ]; }) { });