From 4306b245f9bc7ac89d10f2026e718f030ee10c3d Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Wed, 8 Oct 2025 13:27:41 -0700 Subject: [PATCH 1/2] openblas: 0.3.30 -> 0.3.31 Diff: https://github.com/OpenMathLib/OpenBLAS/compare/v0.3.30...v0.3.31 Should also fix cross compilation --- .../science/math/openblas/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index f3eaef61b82c..d3de85b2b936 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, perl, which, # Most packages depending on openblas expect integer width to match @@ -181,7 +180,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.30"; + version = "0.3.31"; outputs = [ "out" @@ -192,22 +191,9 @@ stdenv.mkDerivation rec { owner = "OpenMathLib"; repo = "OpenBLAS"; rev = "v${version}"; - hash = "sha256-foP2OXUL6ttgYvCxLsxUiVdkPoTvGiHomdNudbSUmSE="; + hash = "sha256-YBR81GOLnTsc0g1SZL+j31/OFucJrBRFqtOTV8lcy8U="; }; - patches = [ - # Remove this once https://github.com/OpenMathLib/OpenBLAS/issues/5414 is - # resolved. - ./disable-sme-sgemm-kernel.patch - - # https://github.com/OpenMathLib/OpenBLAS/issues/5460 - (fetchpatch { - name = "0001-openblas-Use-generic-kernels-for-SCAL-on-POWER4-5.patch"; - url = "https://github.com/OpenMathLib/OpenBLAS/commit/14c9dcaac70d9382de00ba4418643d9587f4950e.patch"; - hash = "sha256-mIOqRc7tE1rV/krrAu630JwApZHdeHCdVmO5j6eDC8U="; - }) - ]; - postPatch = '' # cc1: error: invalid feature modifier 'sve2' in '-march=armv8.5-a+sve+sve2+bf16' substituteInPlace Makefile.arm64 --replace "+sve2+bf16" "" From e015f2cc80fc85959a34d6e4366b2be00e7eabb9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 19 Jan 2026 01:55:28 +0200 Subject: [PATCH 2/2] openblas: use --replace-fail substitution --- pkgs/development/libraries/science/math/openblas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index d3de85b2b936..9c186314130d 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -196,7 +196,7 @@ stdenv.mkDerivation rec { postPatch = '' # cc1: error: invalid feature modifier 'sve2' in '-march=armv8.5-a+sve+sve2+bf16' - substituteInPlace Makefile.arm64 --replace "+sve2+bf16" "" + substituteInPlace Makefile.arm64 --replace-fail "+sve2+bf16" "" ''; inherit blas64;