From 8a965946cb9f9c8288da985050853aa715a9ca97 Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Fri, 29 May 2015 15:16:12 -0500 Subject: [PATCH] switched to atlas as a dependency for liblapack by default --- pkgs/top-level/all-packages.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1da4a9803e5a..cc689f6177dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13819,7 +13819,7 @@ let # great feature, but it's of limited use with pre-built binaries # coming from a central build farm. tolerateCpuTimingInaccuracy = true; - liblapack = liblapack_3_5_0; + liblapack = liblapack_3_5_0WithoutAtlas; withLapack = false; }; @@ -13835,13 +13835,17 @@ let jags = callPackage ../applications/science/math/jags { }; - liblapack = callPackage ../development/libraries/science/math/liblapack { - atlas = null; - }; - liblapackWithAtlas = liblapack.override { inherit atlas; }; - - liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix { }; + # 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 + # 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 { };