summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2014-08-28 16:07:30 -0500
committerThomas Tuegel <ttuegel@gmail.com>2014-08-29 10:06:24 -0500
commit40ccaa2b4c4b60e5a3d308c4713d8d43073a7ecb (patch)
tree280ea0fe7c226bad0ff68733411b58e197d518c4
parentac73fbcda96d01b26c3be3eb87d718d5e9a0ef73 (diff)
downloadnixlib-40ccaa2b4c4b60e5a3d308c4713d8d43073a7ecb.tar
nixlib-40ccaa2b4c4b60e5a3d308c4713d8d43073a7ecb.tar.gz
nixlib-40ccaa2b4c4b60e5a3d308c4713d8d43073a7ecb.tar.bz2
nixlib-40ccaa2b4c4b60e5a3d308c4713d8d43073a7ecb.tar.lz
nixlib-40ccaa2b4c4b60e5a3d308c4713d8d43073a7ecb.tar.xz
nixlib-40ccaa2b4c4b60e5a3d308c4713d8d43073a7ecb.tar.zst
nixlib-40ccaa2b4c4b60e5a3d308c4713d8d43073a7ecb.zip
openblas: pin all the versions julia requires
-rw-r--r--pkgs/development/libraries/science/math/openblas/0.2.2.nix (renamed from pkgs/development/libraries/science/math/openblas/default.nix)0
-rw-r--r--pkgs/top-level/all-packages.nix10
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/0.2.2.nix
index c535b1a39dbb..c535b1a39dbb 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/0.2.2.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9bdf2462406e..6cea37064ccd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3128,10 +3128,12 @@ let
   juliaGit = callPackage ../development/compilers/julia/git-20131013.nix {
     liblapack = liblapack.override {shared = true;};
     llvm = llvm_33;
+    openblas = openblas_0_2_2;
   };
   julia021 = callPackage ../development/compilers/julia/0.2.1.nix {
     liblapack = liblapack.override {shared = true;};
     llvm = llvm_33;
+    openblas = openblas_0_2_2;
   };
   julia030 = let
     liblapack = liblapack_3_5_0.override {shared = true;};
@@ -3140,8 +3142,8 @@ let
     suitesparse = suitesparse.override {
       inherit liblapack;
     };
-    openblas = openblas_0_2_10;
     llvm = llvm_34;
+    openblas = openblas_0_2_10;
   };
   julia = julia021;
 
@@ -10914,10 +10916,14 @@ let
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 
-  openblas = callPackage ../development/libraries/science/math/openblas { };
+  # 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 = openblas_0_2_10;
   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 { };