eigen_3_4_0: init at 3.4.0, migrate eigen{,2,_3_4_0} to by-name (#389101)

+3 -36

pkgs/applications/science/biology/mrtrix/default.nix

··· 4 4 fetchFromGitHub, 5 5 python, 6 6 makeWrapper, 7 - eigen, 7 + eigen_3_4_0, 8 8 fftw, 9 9 libtiff, 10 10 libpng, ··· 18 18 libXext, 19 19 less, 20 20 withGui ? true, 21 - fetchFromGitLab, 22 - fetchpatch, 23 21 }: 24 22 25 - let 26 - # reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19' 27 - # https://github.com/NixOS/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c 28 - eigen' = ( 29 - eigen.overrideAttrs (old: rec { 30 - version = "3.4.0"; 31 - src = fetchFromGitLab { 32 - owner = "libeigen"; 33 - repo = "eigen"; 34 - tag = version; 35 - hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; 36 - }; 37 - patches = (old.patches or [ ]) ++ [ 38 - # Fixes e.g. onnxruntime on aarch64-darwin: 39 - # https://hydra.nixos.org/build/248915128/nixlog/1, 40 - # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. 41 - # 42 - # The patch is from 43 - # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) 44 - # which is two years old, 45 - # but Eigen hasn't had a release in two years either: 46 - # https://gitlab.com/libeigen/eigen/-/issues/2699. 47 - (fetchpatch { 48 - url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; 49 - hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; 50 - }) 51 - ]; 52 - }) 53 - ); 54 - in 55 - 56 23 stdenv.mkDerivation rec { 57 24 pname = "mrtrix"; 58 25 version = "3.0.4-unstable-2025-04-09"; ··· 74 41 buildInputs = 75 42 [ 76 43 ants 77 - eigen' 44 + eigen_3_4_0 78 45 python 79 46 fftw 80 47 libtiff ··· 113 80 114 81 configurePhase = '' 115 82 runHook preConfigure 116 - export EIGEN_CFLAGS="-isystem ${eigen'}/include/eigen3" 83 + export EIGEN_CFLAGS="-isystem ${eigen_3_4_0}/include/eigen3" 117 84 unset LD # similar to https://github.com/MRtrix3/mrtrix3/issues/1519 118 85 ./configure ${lib.optionalString (!withGui) "-nogui"}; 119 86 runHook postConfigure

+2 -30

pkgs/by-name/cu/curv/package.nix

··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitea, 5 - fetchFromGitLab, 6 - fetchpatch, 7 5 cmake, 8 6 git, 9 7 pkg-config, 10 8 boost, 11 - eigen, 9 + eigen_3_4_0, 12 10 glm, 13 11 libGL, 14 12 libpng, ··· 43 41 buildInputs = 44 42 [ 45 43 boost 46 - # https://codeberg.org/doug-moen/curv/issues/228 47 - # reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19' 48 - # https://github.com/nixos/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c 49 - (eigen.overrideAttrs (old: rec { 50 - version = "3.4.0"; 51 - src = fetchFromGitLab { 52 - owner = "libeigen"; 53 - repo = "eigen"; 54 - rev = version; 55 - hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; 56 - }; 57 - patches = (old.patches or [ ]) ++ [ 58 - # Fixes e.g. onnxruntime on aarch64-darwin: 59 - # https://hydra.nixos.org/build/248915128/nixlog/1, 60 - # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. 61 - # 62 - # The patch is from 63 - # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) 64 - # which is two years old, 65 - # but Eigen hasn't had a release in two years either: 66 - # https://gitlab.com/libeigen/eigen/-/issues/2699. 67 - (fetchpatch { 68 - url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; 69 - hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; 70 - }) 71 - ]; 72 - })) 44 + eigen_3_4_0 73 45 glm 74 46 libGL 75 47 libpng

+57

pkgs/by-name/ei/eigen_3_4_0/include-dir.patch

··· 1 + --- a/CMakeLists.txt 2 + +++ b/CMakeLists.txt 3 + @@ -1,5 +1,5 @@ 4 + # cmake_minimum_require must be the first command of the file 5 + -cmake_minimum_required(VERSION 3.5.0) 6 + +cmake_minimum_required(VERSION 3.7.0) 7 + 8 + project(Eigen3) 9 + 10 + @@ -443,7 +443,7 @@ set(PKGCONFIG_INSTALL_DIR 11 + CACHE PATH "The directory relative to CMAKE_INSTALL_PREFIX where eigen3.pc is installed" 12 + ) 13 + 14 + -foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) 15 + +foreach(var CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) 16 + # If an absolute path is specified, make it relative to "{CMAKE_INSTALL_PREFIX}". 17 + if(IS_ABSOLUTE "${${var}}") 18 + file(RELATIVE_PATH "${var}" "${CMAKE_INSTALL_PREFIX}" "${${var}}") 19 + @@ -466,13 +466,6 @@ install(FILES 20 + DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel 21 + ) 22 + 23 + -if(EIGEN_BUILD_PKGCONFIG) 24 + - configure_file(eigen3.pc.in eigen3.pc @ONLY) 25 + - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc 26 + - DESTINATION ${PKGCONFIG_INSTALL_DIR} 27 + - ) 28 + -endif() 29 + - 30 + install(DIRECTORY Eigen DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) 31 + 32 + 33 + @@ -593,8 +586,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) 34 + set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) 35 + set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) 36 + set ( EIGEN_DEFINITIONS "") 37 + -set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" ) 38 + set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} ) 39 + +GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR) 40 + + 41 + +if(EIGEN_BUILD_PKGCONFIG) 42 + + configure_file(eigen3.pc.in eigen3.pc @ONLY) 43 + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc 44 + + DESTINATION ${PKGCONFIG_INSTALL_DIR} 45 + + ) 46 + +endif() 47 + 48 + include (CMakePackageConfigHelpers) 49 + 50 + --- a/eigen3.pc.in 51 + +++ b/eigen3.pc.in 52 + @@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r 53 + Requires: 54 + Version: @EIGEN_VERSION_NUMBER@ 55 + Libs: 56 + -Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@ 57 + +Cflags: -I@EIGEN_INCLUDE_DIR@

+50

pkgs/by-name/ei/eigen_3_4_0/package.nix

··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchFromGitLab, 5 + fetchpatch, 6 + cmake, 7 + }: 8 + 9 + stdenv.mkDerivation rec { 10 + pname = "eigen"; 11 + version = "3.4.0"; 12 + 13 + src = fetchFromGitLab { 14 + owner = "libeigen"; 15 + repo = "eigen"; 16 + rev = version; 17 + hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; 18 + }; 19 + 20 + patches = [ 21 + ./include-dir.patch 22 + # Fixes e.g. onnxruntime on aarch64-darwin: 23 + # https://hydra.nixos.org/build/248915128/nixlog/1, 24 + # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. 25 + # 26 + # The patch is from 27 + # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) 28 + # which is two years old, 29 + # but Eigen hasn't had a release in two years either: 30 + # https://gitlab.com/libeigen/eigen/-/issues/2699. 31 + (fetchpatch { 32 + url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; 33 + hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; 34 + }) 35 + ]; 36 + 37 + nativeBuildInputs = [ cmake ]; 38 + 39 + meta = with lib; { 40 + homepage = "https://eigen.tuxfamily.org"; 41 + description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; 42 + license = licenses.lgpl3Plus; 43 + maintainers = with maintainers; [ 44 + sander 45 + raskin 46 + pbsds 47 + ]; 48 + platforms = platforms.unix; 49 + }; 50 + }

+2 -33

pkgs/by-name/ks/kstars/package.nix

··· 2 2 lib, 3 3 stdenv, 4 4 fetchurl, 5 - fetchFromGitLab, 6 - fetchpatch, 7 5 cfitsio, 8 6 cmake, 9 7 curl, 10 - eigen, 8 + eigen_3_4_0, 11 9 gsl, 12 10 indi-full, 13 11 kdePackages, ··· 22 20 zlib, 23 21 }: 24 22 25 - let 26 - # reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19' 27 - # https://github.com/nixos/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c 28 - eigen' = eigen.overrideAttrs (old: rec { 29 - version = "3.4.0"; 30 - src = fetchFromGitLab { 31 - owner = "libeigen"; 32 - repo = "eigen"; 33 - rev = version; 34 - hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; 35 - }; 36 - patches = (old.patches or [ ]) ++ [ 37 - # Fixes e.g. onnxruntime on aarch64-darwin: 38 - # https://hydra.nixos.org/build/248915128/nixlog/1, 39 - # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. 40 - # 41 - # The patch is from 42 - # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) 43 - # which is two years old, 44 - # but Eigen hasn't had a release in two years either: 45 - # https://gitlab.com/libeigen/eigen/-/issues/2699. 46 - (fetchpatch { 47 - url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; 48 - hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; 49 - }) 50 - ]; 51 - }); 52 - in 53 - 54 23 stdenv.mkDerivation (finalAttrs: { 55 24 pname = "kstars"; 56 25 version = "3.7.5"; ··· 70 39 breeze-icons 71 40 cfitsio 72 41 curl 73 - eigen' 42 + eigen_3_4_0 74 43 gsl 75 44 indi-full 76 45 kconfig

pkgs/development/libraries/eigen/2.0.nix pkgs/by-name/ei/eigen2/package.nix

pkgs/development/libraries/eigen/default.nix pkgs/by-name/ei/eigen/package.nix

pkgs/development/libraries/eigen/include-dir.patch pkgs/by-name/ei/eigen/include-dir.patch

+2 -29

pkgs/development/libraries/libfive/default.nix

··· 3 3 stdenv, 4 4 wrapQtAppsHook, 5 5 fetchFromGitHub, 6 - fetchFromGitLab, 7 - fetchpatch, 8 6 unstableGitUpdater, 9 7 cmake, 10 8 ninja, 11 9 pkg-config, 12 - eigen, 10 + eigen_3_4_0, 13 11 zlib, 14 12 libpng, 15 13 boost, ··· 38 36 python.pkgs.pythonImportsCheckHook 39 37 ]; 40 38 buildInputs = [ 41 - # reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19' 42 - # https://github.com/nixos/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c 43 - (eigen.overrideAttrs (old: rec { 44 - version = "3.4.0"; 45 - src = fetchFromGitLab { 46 - owner = "libeigen"; 47 - repo = "eigen"; 48 - rev = version; 49 - hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; 50 - }; 51 - patches = (old.patches or [ ]) ++ [ 52 - # Fixes e.g. onnxruntime on aarch64-darwin: 53 - # https://hydra.nixos.org/build/248915128/nixlog/1, 54 - # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. 55 - # 56 - # The patch is from 57 - # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) 58 - # which is two years old, 59 - # but Eigen hasn't had a release in two years either: 60 - # https://gitlab.com/libeigen/eigen/-/issues/2699. 61 - (fetchpatch { 62 - url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; 63 - hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; 64 - }) 65 - ]; 66 - })) 39 + eigen_3_4_0 67 40 zlib 68 41 libpng 69 42 boost

-4

pkgs/top-level/all-packages.nix

··· 9101 9101 stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv; 9102 9102 }; 9103 9103 9104 - eigen = callPackage ../development/libraries/eigen { }; 9105 - 9106 - eigen2 = callPackage ../development/libraries/eigen/2.0.nix { }; 9107 - 9108 9104 vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { }; 9109 9105 9110 9106 vmmlib = callPackage ../development/libraries/vmmlib {

Configure Feed

Configure Feed