diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix deleted file mode 100644 index c48f8e4c973..00000000000 --- a/pkgs/development/libraries/eigen/3.3.nix +++ /dev/null @@ -1,29 +0,0 @@ -{stdenv, fetchurl, fetchpatch, cmake}: - -let - version = "3.3.5"; -in -stdenv.mkDerivation { - name = "eigen-${version}"; - - src = fetchurl { - url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; - name = "eigen-${version}.tar.gz"; - sha256 = "13p60x6k61zq2y2in7g4fy5p55cr5dbmj3zvw10zcazxraxbcm04"; - }; - - patches = [ - ./include-dir.patch - ]; - - nativeBuildInputs = [ cmake ]; - - meta = with stdenv.lib; { - description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; - license = licenses.lgpl3Plus; - homepage = http://eigen.tuxfamily.org ; - platforms = platforms.unix; - maintainers = with stdenv.lib.maintainers; [ sander raskin ]; - inherit version; - }; -} diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index c120132dcb8..c48f8e4c973 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, cmake}: +{stdenv, fetchurl, fetchpatch, cmake}: let - version = "3.2.10"; + version = "3.3.5"; in stdenv.mkDerivation { name = "eigen-${version}"; @@ -9,17 +9,15 @@ stdenv.mkDerivation { src = fetchurl { url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; - sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04"; + sha256 = "13p60x6k61zq2y2in7g4fy5p55cr5dbmj3zvw10zcazxraxbcm04"; }; + patches = [ + ./include-dir.patch + ]; + nativeBuildInputs = [ cmake ]; - doCheck = false; # a couple of tests fail with "Child aborted" - - postInstall = '' - sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc - ''; - meta = with stdenv.lib; { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = licenses.lgpl3Plus; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2320e358805..0a9db55f2a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1676,9 +1676,7 @@ with pkgs; apparix = callPackage ../tools/misc/apparix { }; - appleseed = callPackage ../tools/graphics/appleseed { - eigen = eigen3_3; - }; + appleseed = callPackage ../tools/graphics/appleseed { }; arping = callPackage ../tools/networking/arping { }; @@ -3213,9 +3211,7 @@ with pkgs; halibut = callPackage ../tools/typesetting/halibut { }; - halide = callPackage ../development/compilers/halide { - eigen = eigen3_3; - }; + halide = callPackage ../development/compilers/halide { }; hardinfo = callPackage ../tools/system/hardinfo { }; @@ -9471,7 +9467,6 @@ with pkgs; editline = callPackage ../development/libraries/editline { }; eigen = callPackage ../development/libraries/eigen {}; - eigen3_3 = callPackage ../development/libraries/eigen/3.3.nix {}; eigen2 = callPackage ../development/libraries/eigen/2.0.nix {}; @@ -10702,9 +10697,7 @@ with pkgs; libf2c = callPackage ../development/libraries/libf2c {}; - libfive = callPackage ../development/libraries/libfive { - eigen = eigen3_3; - }; + libfive = callPackage ../development/libraries/libfive { }; libfixposix = callPackage ../development/libraries/libfixposix {}; @@ -21677,7 +21670,6 @@ with pkgs; }; caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec { - eigen = eigen3_3; inherit (python3Packages) python future six numpy pydot; protobuf = protobuf3_1; python-protobuf = python3Packages.protobuf.override { inherit protobuf; };