From e66d263f6be25c0ac45261d2fdfd9bdc545e3021 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 18 Nov 2018 10:52:26 +0000 Subject: [PATCH] eigen3_3: move version overrides to all-packages.nix --- pkgs/development/compilers/halide/default.nix | 4 ++-- pkgs/development/libraries/libfive/default.nix | 6 +++--- .../libraries/science/math/caffe2/default.nix | 6 +++--- pkgs/tools/graphics/appleseed/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 16 +++++++++++----- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 44af8f4bf23..1d3b13937fc 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -1,5 +1,5 @@ { llvmPackages, lib, fetchFromGitHub, cmake -, libpng, libjpeg, mesa_noglu, eigen3_3, openblas +, libpng, libjpeg, mesa_noglu, eigen, openblas }: let @@ -37,7 +37,7 @@ in llvmPackages.stdenv.mkDerivation { # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # 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 ]; diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 2c3085fc384..4b02d651929 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen3_3, +{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen, zlib, libpng, boost, qt5, guile }: @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { sha256 = "0bfxysf5f4ripgcv546il8wnw5p0d4s75kdjlwvj32549537hlz0"; }; 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: postFixup = '' ln -s "$out/bin/Studio" "$out/bin/libfive-studio" ''; - + meta = with stdenv.lib; { description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile"; homepage = https://libfive.com/; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index c1994533b78..d568e945202 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -3,7 +3,7 @@ , glog, google-gflags, gtest , protobuf, snappy , python, future, six, python-protobuf, numpy, pydot -, eigen3 +, eigen , doxygen , useCuda ? (config.cudaSupport or false), cudatoolkit ? null , useCudnn ? (config.cudnnSupport or false), cudnn ? null @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" ]; 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 useCudnn cudnn ++ lib.optional useOpenmp openmp @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { ${installExtraSrc cub} ${installExtraSrc pybind11} # 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 = '' diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index 0fe6dcfbfd3..7ac9a201661 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -1,5 +1,5 @@ { 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 }: @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { sha256 = "0m7zvfkdjfn48zzaxh2wa1bsaj4l876a05bzgmjlfq5dz3202anr"; }; buildInputs = [ - cmake pkgconfig boost_static guile eigen3_3 libpng python + cmake pkgconfig boost_static guile eigen libpng python libGLU qt4 openexr openimageio opencolorio xercesc osl seexpr ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 222a12dd579..aef230a6854 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; };