JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'openblas'

Browse Source
This commit is contained in:
Thomas Tuegel 2015-04-24 19:34:39 -05:00
commit 66d44ef6d4
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/science/math/openblas/default.nix
View File

@ -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";
};

8
pkgs/top-level/all-packages.nix
View File

@ -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;
};
@ -13439,16 +13438,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 { };