From b1d54822e47e8be7be0eca832e3f7c9dfc530ef2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 4 Jun 2018 20:03:09 -0500 Subject: [PATCH 1/2] openblas: remove patch that's no longer needed (PR merged) --- .../libraries/science/math/openblas/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 283b8fde80f..bca38253b38 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -118,13 +118,6 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1" ++ mapAttrsToList (var: val: var + "=" + val) config; - patches = stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc") - # https://github.com/xianyi/OpenBLAS/pull/1247 - (fetchpatch { - url = "https://github.com/xianyi/OpenBLAS/commit/88a35ff457f55e527e0e8a503a0dc61976c1846d.patch"; - sha256 = "1a3qrhvl5hp06c53fjqghq4zgf6ls7narm06l0shcvs57hznh09n"; - }); - doCheck = true; checkTarget = "tests"; From 912b58a2c10f238f807023b50e675b13a845e73b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 7 Jun 2018 13:38:08 -0500 Subject: [PATCH 2/2] openblas: workaround mass-rebuilds Thanks for the suggestion: https://github.com/NixOS/nixpkgs/pull/41639#issuecomment-395509669 --- pkgs/development/libraries/science/math/openblas/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index bca38253b38..bd095a11f08 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -118,6 +118,8 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1" ++ mapAttrsToList (var: val: var + "=" + val) config; + patches = []; # TODO: Remove on next mass-rebuild + doCheck = true; checkTarget = "tests";