diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-04-24 19:34:39 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-04-24 19:34:39 -0500 |
commit | 66d44ef6d4efce68e709024e2701316e5652fd61 (patch) | |
tree | 44205b3614e35b227d8c7cdd1869dc8926ecc4cb /pkgs/top-level | |
parent | ca9d04965454ae42fac299e68032cb7b37d875be (diff) | |
parent | 9508fcafdd73fb6171d13091ee48368bf81dad9c (diff) | |
download | nixlib-66d44ef6d4efce68e709024e2701316e5652fd61.tar nixlib-66d44ef6d4efce68e709024e2701316e5652fd61.tar.gz nixlib-66d44ef6d4efce68e709024e2701316e5652fd61.tar.bz2 nixlib-66d44ef6d4efce68e709024e2701316e5652fd61.tar.lz nixlib-66d44ef6d4efce68e709024e2701316e5652fd61.tar.xz nixlib-66d44ef6d4efce68e709024e2701316e5652fd61.tar.zst nixlib-66d44ef6d4efce68e709024e2701316e5652fd61.zip |
Merge branch 'openblas'
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d1d4aa20262..af342adca295 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; }; @@ -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 { }; |