Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

eigen3_3: move version overrides to all-packages.nix

+21 -15
+2 -2
pkgs/development/compilers/halide/default.nix
··· 1 1 { llvmPackages, lib, fetchFromGitHub, cmake 2 - , libpng, libjpeg, mesa_noglu, eigen3_3, openblas 2 + , libpng, libjpeg, mesa_noglu, eigen, openblas 3 3 }: 4 4 5 5 let ··· 37 37 # Note: only openblas and not atlas part of this Nix expression 38 38 # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix 39 39 # to get a hint howto setup atlas instead of openblas 40 - buildInputs = [ llvmPackages.llvm libpng libjpeg mesa_noglu eigen3_3 openblas ]; 40 + buildInputs = [ llvmPackages.llvm libpng libjpeg mesa_noglu eigen openblas ]; 41 41 42 42 nativeBuildInputs = [ cmake ]; 43 43
+3 -3
pkgs/development/libraries/libfive/default.nix
··· 1 - { stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen3_3, 1 + { stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen, 2 2 zlib, libpng, boost, qt5, guile 3 3 }: 4 4 ··· 13 13 sha256 = "0bfxysf5f4ripgcv546il8wnw5p0d4s75kdjlwvj32549537hlz0"; 14 14 }; 15 15 nativeBuildInputs = [ cmake ninja pkgconfig ]; 16 - buildInputs = [ eigen3_3 zlib libpng boost qt5.qtimageformats guile ]; 16 + buildInputs = [ eigen zlib libpng boost qt5.qtimageformats guile ]; 17 17 18 18 # Link "Studio" binary to "libfive-studio" to be more obvious: 19 19 postFixup = '' 20 20 ln -s "$out/bin/Studio" "$out/bin/libfive-studio" 21 21 ''; 22 - 22 + 23 23 meta = with stdenv.lib; { 24 24 description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile"; 25 25 homepage = https://libfive.com/;
+3 -3
pkgs/development/libraries/science/math/caffe2/default.nix
··· 3 3 , glog, google-gflags, gtest 4 4 , protobuf, snappy 5 5 , python, future, six, python-protobuf, numpy, pydot 6 - , eigen3 6 + , eigen 7 7 , doxygen 8 8 , useCuda ? (config.cudaSupport or false), cudatoolkit ? null 9 9 , useCudnn ? (config.cudnnSupport or false), cudnn ? null ··· 74 74 outputs = [ "bin" "out" ]; 75 75 propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle 76 76 77 - buildInputs = [ glog google-gflags protobuf snappy eigen3 ] 77 + buildInputs = [ glog google-gflags protobuf snappy eigen ] 78 78 ++ lib.optional useCuda cudatoolkit 79 79 ++ lib.optional useCudnn cudnn 80 80 ++ lib.optional useOpenmp openmp ··· 116 116 ${installExtraSrc cub} 117 117 ${installExtraSrc pybind11} 118 118 # XXX hack 119 - export NIX_CFLAGS_COMPILE="-I ${eigen3}/include/eigen3/ $NIX_CFLAGS_COMPILE" 119 + export NIX_CFLAGS_COMPILE="-I ${eigen}/include/eigen3/ $NIX_CFLAGS_COMPILE" 120 120 ''; 121 121 122 122 postInstall = ''
+2 -2
pkgs/tools/graphics/appleseed/default.nix
··· 1 1 { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile, 2 - eigen3_3, libpng, python, libGLU, qt4, openexr, openimageio, 2 + eigen, libpng, python, libGLU, qt4, openexr, openimageio, 3 3 opencolorio, xercesc, ilmbase, osl, seexpr 4 4 }: 5 5 ··· 19 19 sha256 = "0m7zvfkdjfn48zzaxh2wa1bsaj4l876a05bzgmjlfq5dz3202anr"; 20 20 }; 21 21 buildInputs = [ 22 - cmake pkgconfig boost_static guile eigen3_3 libpng python 22 + cmake pkgconfig boost_static guile eigen libpng python 23 23 libGLU qt4 openexr openimageio opencolorio xercesc 24 24 osl seexpr 25 25 ];
+11 -5
pkgs/top-level/all-packages.nix
··· 1674 1674 1675 1675 apparix = callPackage ../tools/misc/apparix { }; 1676 1676 1677 - appleseed = callPackage ../tools/graphics/appleseed { }; 1677 + appleseed = callPackage ../tools/graphics/appleseed { 1678 + eigen = eigen3_3; 1679 + }; 1678 1680 1679 1681 arping = callPackage ../tools/networking/arping { }; 1680 1682 ··· 3217 3219 3218 3220 halibut = callPackage ../tools/typesetting/halibut { }; 3219 3221 3220 - halide = callPackage ../development/compilers/halide {}; 3222 + halide = callPackage ../development/compilers/halide { 3223 + eigen = eigen3_3; 3224 + }; 3221 3225 3222 3226 hardinfo = callPackage ../tools/system/hardinfo { }; 3223 3227 ··· 5979 5983 }; 5980 5984 5981 5985 openconnect_pa = callPackage ../tools/networking/openconnect_pa { 5982 - openssl = null; 5986 + openssl = null; 5983 5987 }; 5984 5988 5985 5989 openconnect = openconnect_gnutls; ··· 10702 10706 10703 10707 libf2c = callPackage ../development/libraries/libf2c {}; 10704 10708 10705 - libfive = callPackage ../development/libraries/libfive {}; 10709 + libfive = callPackage ../development/libraries/libfive { 10710 + eigen = eigen3_3; 10711 + }; 10706 10712 10707 10713 libfixposix = callPackage ../development/libraries/libfixposix {}; 10708 10714 ··· 21677 21683 }; 21678 21684 21679 21685 caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec { 21680 - eigen3 = eigen3_3; 21686 + eigen = eigen3_3; 21681 21687 inherit (python3Packages) python future six numpy pydot; 21682 21688 protobuf = protobuf3_1; 21683 21689 python-protobuf = python3Packages.protobuf.override { inherit protobuf; };