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

eigen3_3: move version overrides to all-packages.nix

Browse Source
This commit is contained in:
Orivej Desh 2018-11-18 10:52:26 +00:00
parent c7366d767c
commit e66d263f6b
5 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/halide/default.nix
View File

@ -1,5 +1,5 @@
{ llvmPackages, lib, fetchFromGitHub, cmake { llvmPackages, lib, fetchFromGitHub, cmake
, libpng, libjpeg, mesa_noglu, eigen3_3, openblas , libpng, libjpeg, mesa_noglu, eigen, openblas
}: }:
let let
@ -37,7 +37,7 @@ in llvmPackages.stdenv.mkDerivation {
# Note: only openblas and not atlas part of this Nix expression # Note: only openblas and not atlas part of this Nix expression
# see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix
# to get a hint howto setup atlas instead of openblas # to get a hint howto setup atlas instead of openblas
buildInputs = [ llvmPackages.llvm libpng libjpeg mesa_noglu eigen3_3 openblas ]; buildInputs = [ llvmPackages.llvm libpng libjpeg mesa_noglu eigen openblas ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

6
pkgs/development/libraries/libfive/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen3_3, { stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen,
zlib, libpng, boost, qt5, guile zlib, libpng, boost, qt5, guile
}: }:
@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
sha256 = "0bfxysf5f4ripgcv546il8wnw5p0d4s75kdjlwvj32549537hlz0"; sha256 = "0bfxysf5f4ripgcv546il8wnw5p0d4s75kdjlwvj32549537hlz0";
}; };
nativeBuildInputs = [ cmake ninja pkgconfig ]; nativeBuildInputs = [ cmake ninja pkgconfig ];
buildInputs = [ eigen3_3 zlib libpng boost qt5.qtimageformats guile ]; buildInputs = [ eigen zlib libpng boost qt5.qtimageformats guile ];
# Link "Studio" binary to "libfive-studio" to be more obvious: # Link "Studio" binary to "libfive-studio" to be more obvious:
postFixup = '' postFixup = ''
ln -s "$out/bin/Studio" "$out/bin/libfive-studio" ln -s "$out/bin/Studio" "$out/bin/libfive-studio"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile"; description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile";
homepage = https://libfive.com/; homepage = https://libfive.com/;

6
pkgs/development/libraries/science/math/caffe2/default.nix
View File

@ -3,7 +3,7 @@
, glog, google-gflags, gtest , glog, google-gflags, gtest
, protobuf, snappy , protobuf, snappy
, python, future, six, python-protobuf, numpy, pydot , python, future, six, python-protobuf, numpy, pydot
, eigen3 , eigen
, doxygen , doxygen
, useCuda ? (config.cudaSupport or false), cudatoolkit ? null , useCuda ? (config.cudaSupport or false), cudatoolkit ? null
, useCudnn ? (config.cudnnSupport or false), cudnn ? null , useCudnn ? (config.cudnnSupport or false), cudnn ? null
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "out" ]; outputs = [ "bin" "out" ];
propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle
buildInputs = [ glog google-gflags protobuf snappy eigen3 ] buildInputs = [ glog google-gflags protobuf snappy eigen ]
++ lib.optional useCuda cudatoolkit ++ lib.optional useCuda cudatoolkit
++ lib.optional useCudnn cudnn ++ lib.optional useCudnn cudnn
++ lib.optional useOpenmp openmp ++ lib.optional useOpenmp openmp
@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
${installExtraSrc cub} ${installExtraSrc cub}
${installExtraSrc pybind11} ${installExtraSrc pybind11}
# XXX hack # XXX hack
export NIX_CFLAGS_COMPILE="-I ${eigen3}/include/eigen3/ $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="-I ${eigen}/include/eigen3/ $NIX_CFLAGS_COMPILE"
''; '';
postInstall = '' postInstall = ''

4
pkgs/tools/graphics/appleseed/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile, { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile,
eigen3_3, libpng, python, libGLU, qt4, openexr, openimageio, eigen, libpng, python, libGLU, qt4, openexr, openimageio,
opencolorio, xercesc, ilmbase, osl, seexpr opencolorio, xercesc, ilmbase, osl, seexpr
}: }:
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
sha256 = "0m7zvfkdjfn48zzaxh2wa1bsaj4l876a05bzgmjlfq5dz3202anr"; sha256 = "0m7zvfkdjfn48zzaxh2wa1bsaj4l876a05bzgmjlfq5dz3202anr";
}; };
buildInputs = [ buildInputs = [
cmake pkgconfig boost_static guile eigen3_3 libpng python cmake pkgconfig boost_static guile eigen libpng python
libGLU qt4 openexr openimageio opencolorio xercesc libGLU qt4 openexr openimageio opencolorio xercesc
osl seexpr osl seexpr
]; ];

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

@ -1674,7 +1674,9 @@ with pkgs;
apparix = callPackage ../tools/misc/apparix { }; apparix = callPackage ../tools/misc/apparix { };
appleseed = callPackage ../tools/graphics/appleseed { }; appleseed = callPackage ../tools/graphics/appleseed {
eigen = eigen3_3;
};
arping = callPackage ../tools/networking/arping { }; arping = callPackage ../tools/networking/arping { };
@ -3217,7 +3219,9 @@ with pkgs;
halibut = callPackage ../tools/typesetting/halibut { }; halibut = callPackage ../tools/typesetting/halibut { };
halide = callPackage ../development/compilers/halide {}; halide = callPackage ../development/compilers/halide {
eigen = eigen3_3;
};
hardinfo = callPackage ../tools/system/hardinfo { }; hardinfo = callPackage ../tools/system/hardinfo { };
@ -5979,7 +5983,7 @@ with pkgs;
}; };
openconnect_pa = callPackage ../tools/networking/openconnect_pa { openconnect_pa = callPackage ../tools/networking/openconnect_pa {
openssl = null; openssl = null;
}; };
openconnect = openconnect_gnutls; openconnect = openconnect_gnutls;
@ -10702,7 +10706,9 @@ with pkgs;
libf2c = callPackage ../development/libraries/libf2c {}; libf2c = callPackage ../development/libraries/libf2c {};
libfive = callPackage ../development/libraries/libfive {}; libfive = callPackage ../development/libraries/libfive {
eigen = eigen3_3;
};
libfixposix = callPackage ../development/libraries/libfixposix {}; libfixposix = callPackage ../development/libraries/libfixposix {};
@ -21677,7 +21683,7 @@ with pkgs;
}; };
caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec { caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec {
eigen3 = eigen3_3; eigen = eigen3_3;
inherit (python3Packages) python future six numpy pydot; inherit (python3Packages) python future six numpy pydot;
protobuf = protobuf3_1; protobuf = protobuf3_1;
python-protobuf = python3Packages.protobuf.override { inherit protobuf; }; python-protobuf = python3Packages.protobuf.override { inherit protobuf; };