Merge a subset of staging (security)
In particular, this contains Firefox-related and libgcrypt updates. Other larger rebuilds would apparently need lots of time to catch up on Hydra, due to nontrivial rebuilds in other branches than staging.
This commit is contained in:
@@ -77,13 +77,13 @@ let
|
||||
then blas64_
|
||||
else hasPrefix "x86_64" stdenv.system;
|
||||
|
||||
version = "0.2.20";
|
||||
version = "0.3.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "openblas-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz";
|
||||
sha256 = "157kpkbpwlr57dkmqiwr3qp9fglfidagv7l6fibrhln6v4aqpwsy";
|
||||
sha256 = "18giv3lsh8cva01z4rhsx8jvgliknni0jp7vxkc69qxb14vm8lfg";
|
||||
name = "openblas-${version}.tar.gz";
|
||||
};
|
||||
|
||||
@@ -118,12 +118,7 @@ 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";
|
||||
});
|
||||
patches = []; # TODO: Remove on next mass-rebuild
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "tests";
|
||||
|
||||
Reference in New Issue
Block a user