about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2018-11-18 10:52:26 +0000
committerOrivej Desh <orivej@gmx.fr>2018-11-18 10:53:25 +0000
commite66d263f6be25c0ac45261d2fdfd9bdc545e3021 (patch)
tree36398be624030262c2de453555f139621ecd7c44 /pkgs/top-level
parentc7366d767c764e6665b8b53564f90e9c9ea8c615 (diff)
downloadnixlib-e66d263f6be25c0ac45261d2fdfd9bdc545e3021.tar
nixlib-e66d263f6be25c0ac45261d2fdfd9bdc545e3021.tar.gz
nixlib-e66d263f6be25c0ac45261d2fdfd9bdc545e3021.tar.bz2
nixlib-e66d263f6be25c0ac45261d2fdfd9bdc545e3021.tar.lz
nixlib-e66d263f6be25c0ac45261d2fdfd9bdc545e3021.tar.xz
nixlib-e66d263f6be25c0ac45261d2fdfd9bdc545e3021.tar.zst
nixlib-e66d263f6be25c0ac45261d2fdfd9bdc545e3021.zip
eigen3_3: move version overrides to all-packages.nix
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix16
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 222a12dd5798..aef230a68548 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1674,7 +1674,9 @@ with pkgs;
 
   apparix = callPackage ../tools/misc/apparix { };
 
-  appleseed = callPackage ../tools/graphics/appleseed { };
+  appleseed = callPackage ../tools/graphics/appleseed {
+    eigen = eigen3_3;
+  };
 
   arping = callPackage ../tools/networking/arping { };
 
@@ -3217,7 +3219,9 @@ with pkgs;
 
   halibut = callPackage ../tools/typesetting/halibut { };
 
-  halide = callPackage ../development/compilers/halide {};
+  halide = callPackage ../development/compilers/halide {
+    eigen = eigen3_3;
+  };
 
   hardinfo = callPackage ../tools/system/hardinfo { };
 
@@ -5979,7 +5983,7 @@ with pkgs;
   };
 
   openconnect_pa = callPackage ../tools/networking/openconnect_pa {
-    openssl = null;    
+    openssl = null;
   };
 
   openconnect = openconnect_gnutls;
@@ -10702,7 +10706,9 @@ with pkgs;
 
   libf2c = callPackage ../development/libraries/libf2c {};
 
-  libfive = callPackage ../development/libraries/libfive {};
+  libfive = callPackage ../development/libraries/libfive {
+    eigen = eigen3_3;
+  };
 
   libfixposix = callPackage ../development/libraries/libfixposix {};
 
@@ -21677,7 +21683,7 @@ with pkgs;
   };
 
   caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec {
-    eigen3 = eigen3_3;
+    eigen = eigen3_3;
     inherit (python3Packages) python future six numpy pydot;
     protobuf = protobuf3_1;
     python-protobuf = python3Packages.protobuf.override { inherit protobuf; };