From 8ed9f847b19955125c3d6d74ecd387f420afb82c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 24 Apr 2015 18:21:20 -0500 Subject: [PATCH 1/2] openblas: update to 0.2.14 --- .../libraries/science/math/openblas/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 90f635c7e31..e779957a6fb 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -3,22 +3,27 @@ with stdenv.lib; let local = config.openblas.preferLocalBuild or false; + binary = + { + i686-linux = "32"; + x86_64-linux = "64"; + }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); genericFlags = [ "DYNAMIC_ARCH=1" - "TARGET=GENERIC" "NUM_THREADS=64" + "BINARY=${binary}" ]; localFlags = config.openblas.flags or optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ]; in stdenv.mkDerivation rec { - version = "0.2.12"; + version = "0.2.14"; name = "openblas-${version}"; src = fetchurl { url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}"; - sha256 = "0389dnybfvag8zms5w1xlwcknq2l2am1vcfssjkax49r1rq2f5qg"; + sha256 = "0av3pd96j8rx5i65f652xv9wqfkaqn0w4ma1gvbyz73i6j2hi9db"; name = "openblas-${version}.tar.gz"; }; From 9508fcafdd73fb6171d13091ee48368bf81dad9c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 24 Apr 2015 19:12:28 -0500 Subject: [PATCH 2/2] openblas: drop old versions --- pkgs/top-level/all-packages.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bfa25de6f3..e260a4b7ba0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3878,7 +3878,6 @@ let julia02 = callPackage ../development/compilers/julia/0.2.nix { liblapack = liblapack.override {shared = true;}; llvm = llvm_33; - openblas = openblas_0_2_2; suitesparse = suitesparse_4_2; }; @@ -13435,16 +13434,9 @@ let liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; - # julia is pinned to specific versions of openblas, so keep old versions - # until they aren't needed. The un-versioned attribute may continue to track - # upstream development. openblas = callPackage ../development/libraries/science/math/openblas { liblapack = liblapack_3_5_0; }; - openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix { - liblapack = liblapack_3_5_0; - }; - openblas_0_2_2 = callPackage ../development/libraries/science/math/openblas/0.2.2.nix { }; mathematica = callPackage ../applications/science/math/mathematica { }; mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { };