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

switched to atlas as a dependency for liblapack by default

Browse Source
This commit is contained in:
Allen Nelson 2015-05-29 15:16:12 -05:00
parent e001340cf6
commit 8a965946cb
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13819,7 +13819,7 @@ let
# great feature, but it's of limited use with pre-built binaries # great feature, but it's of limited use with pre-built binaries
# coming from a central build farm. # coming from a central build farm.
tolerateCpuTimingInaccuracy = true; tolerateCpuTimingInaccuracy = true;
liblapack = liblapack_3_5_0; liblapack = liblapack_3_5_0WithoutAtlas;
withLapack = false; withLapack = false;
}; };
@ -13835,13 +13835,17 @@ let
jags = callPackage ../applications/science/math/jags { }; jags = callPackage ../applications/science/math/jags { };
liblapack = callPackage ../development/libraries/science/math/liblapack {
atlas = null;
};
liblapackWithAtlas = liblapack.override { inherit atlas; }; # We have essentially 4 permutations of liblapack: version 3.4.1 or 3.5.0,
# and with or without atlas as a dependency. The default `liblapack` is 3.4.1
liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix { }; # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0
# without atlas. Etc.
liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {};
liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; };
liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {};
liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; };
liblapack = liblapackWithAtlas;
liblapack_3_5_0 = liblapack_3_5_0WithAtlas;
liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };