From 84a0ba6d867405e13e25149fb80ed76fea70871a Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Mon, 24 Mar 2025 11:06:15 +0100
Subject: [PATCH 01/44] New triqs version

---
 triqsPackages/itertools/default.nix     |  4 +-
 triqsPackages/itertools/itertools.patch | 14 ++-----
 triqsPackages/triqs/default.nix         | 18 +++------
 triqsPackages/triqs/triqs.patch         | 54 +------------------------
 4 files changed, 11 insertions(+), 79 deletions(-)

diff --git a/triqsPackages/itertools/default.nix b/triqsPackages/itertools/default.nix
index 09815e8..faf6c37 100644
--- a/triqsPackages/itertools/default.nix
+++ b/triqsPackages/itertools/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "itertools";
-  version = "1.1.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "TRIQS";
     repo = pname;
     rev = version;
-    sha256 = "sha256-01PXIrypIQZo1X3UHKjVyZ230AS8LfGhvJunD/A3ttQ=";
+    sha256 = "sha256-MK5tHFP61BK3vmFNpSyxU7PCHXg+wv7gEkWBNAxUoaQ=";
   };
 
   patches = [ ./itertools.patch ];
diff --git a/triqsPackages/itertools/itertools.patch b/triqsPackages/itertools/itertools.patch
index 22124f4..6d3223f 100644
--- a/triqsPackages/itertools/itertools.patch
+++ b/triqsPackages/itertools/itertools.patch
@@ -2,22 +2,14 @@ diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
 index a661f8f..a96c8f7 100644
 --- a/deps/CMakeLists.txt
 +++ b/deps/CMakeLists.txt
-@@ -53,7 +53,6 @@ if(Build_Documentation)
-     GIT_REPO https://github.com/TRIQS/cpp2py
-     VERSION 2.0
-     GIT_TAG master
--    BUILD_ALWAYS
-     EXCLUDE_FROM_ALL
-   )
- endif()
-@@ -62,7 +61,6 @@ endif()
+@@ -51,6 +51,5 @@
  external_dependency(GTest
    GIT_REPO https://github.com/google/googletest
    GIT_TAG main
 -  BUILD_ALWAYS
    EXCLUDE_FROM_ALL
- )
- 
+ ) 
+
 diff --git a/test/c++/CMakeLists.txt b/test/c++/CMakeLists.txt
 index 14ac6ae..8968087 100644
 --- a/test/c++/CMakeLists.txt
diff --git a/triqsPackages/triqs/default.nix b/triqsPackages/triqs/default.nix
index 859d76c..6a88e6d 100644
--- a/triqsPackages/triqs/default.nix
+++ b/triqsPackages/triqs/default.nix
@@ -2,8 +2,10 @@
 , lib
 , fetchFromGitHub
 , fetchpatch
+, gcc12
 , cmake
 , gtest
+, fmt
 , python3Packages
 , boost
 , triqsPackages
@@ -16,29 +18,19 @@
 
 stdenv.mkDerivation rec {
   pname = "triqs";
-  version = "3.1.1";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "TRIQS";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Wp/x6ecX8t56ap1qogbFZ/jjSp6MRrmdyVrFLXqaG8I=";
+    sha256 = "sha256-0It/Xr2ldaQWnlR111Dl+USjRj4cS8Sojscac5bjRzc=";
   };
 
   patches = [
     ./triqs.patch
-    (fetchpatch {
-      name = "fix-np.int-etc.-removed-in-numpy-1.24.patch";
-      url = "https://github.com/TRIQS/triqs/commit/886580a89176d8f1f9852c4c5dd344d258953464.patch";
-      sha256 = "sha256-MOccsJOVqrtJ+z0wdJouqQAvhzzBKeYuFzvJtUx+Cr8=";
-    })
-    (fetchpatch {
-      name = "Added-__array_priority__-to-the-Gf-class-to-make-sure-its-__rmul__.patch";
-      url = "https://github.com/TRIQS/triqs/commit/cc85dc09543f03ed1865d863db639213a52534d2.patch";
-      sha256 = "sha256-rAIZPh0mR0qkATY3sgwrDS2tipLJ6jSAyi/Iepkt9RM=";
-    })
   ];
-  nativeBuildInputs = [ cmake gtest python3Packages.wrapPython ];
+  nativeBuildInputs = [ gcc12 cmake gtest fmt python3Packages.wrapPython triqsPackages.itertools ];
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBuild_Deps=Never" ];
   buildInputs = [
     boost
diff --git a/triqsPackages/triqs/triqs.patch b/triqsPackages/triqs/triqs.patch
index 7d620b0..8c012fe 100644
--- a/triqsPackages/triqs/triqs.patch
+++ b/triqsPackages/triqs/triqs.patch
@@ -1,63 +1,11 @@
-diff --git a/c++/triqs/triqs++.in b/c++/triqs/triqs++.in
-index c7a78f2..7080f8b 100644
---- a/c++/triqs/triqs++.in
-+++ b/c++/triqs/triqs++.in
-@@ -1,4 +1,4 @@
--#!@PYTHON_EXECUTABLE@
-+#!@CPP2PY_PYTHON_EXECUTABLE@
- 
- cxxflags = "@CMAKE_CXXFLAGS@ @triqs_CXXFLAGS@ @python_and_numpy_CXXFLAGS@"
- ldflags = "@triqs_LDFLAGS@ @python_and_numpy_LDFLAGS@ -L@CMAKE_INSTALL_PREFIX@/lib -ltriqs -lcpp2py"
-diff --git a/cmake/FindTest.cmake b/cmake/FindTest.cmake
-index c80b84c..fb5232e 100644
---- a/cmake/FindTest.cmake
-+++ b/cmake/FindTest.cmake
-@@ -51,11 +51,11 @@ function(add_python_test)
-   endif()
- 
-   foreach(NP ${ARG_MPI_NUMPROC})
--    add_test(${testname}_np${NP} ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${ARG_MPI_NUMPROC} ${MPIEXEC_PREFLAGS} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${testfile})
-+    add_test(${testname}_np${NP} ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${ARG_MPI_NUMPROC} ${MPIEXEC_PREFLAGS} ${CPP2PY_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${testfile})
-     set_property(TEST ${testname}_np${NP} PROPERTY ENVIRONMENT ${testenv})
-   endforeach()
- 
--  add_test(${testname} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${testfile})
-+  add_test(${testname} ${CPP2PY_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${testfile})
-   set_property(TEST ${testname} PROPERTY ENVIRONMENT ${testenv})
- 
- endfunction(add_python_test)
-diff --git a/cmake/FindTriqsTest.cmake.in b/cmake/FindTriqsTest.cmake.in
-index 5107df9..487e469 100644
---- a/cmake/FindTriqsTest.cmake.in
-+++ b/cmake/FindTriqsTest.cmake.in
-@@ -1,4 +1,4 @@
--set(PYTHON_EXECUTABLE @PYTHON_EXECUTABLE@)
-+set(PYTHON_EXECUTABLE @CPP2PY_PYTHON_EXECUTABLE@)
- 
- # runs a c++ test
- # if there is a .ref file a comparison test is done
 diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
 index cb56367..187f209 100644
 --- a/deps/CMakeLists.txt
 +++ b/deps/CMakeLists.txt
-@@ -64,7 +64,6 @@ endif()
+@@ -64,6 +64,5 @@ endif()
  external_dependency(GTest
    GIT_REPO https://github.com/google/googletest
    GIT_TAG main
 -  BUILD_ALWAYS
    EXCLUDE_FROM_ALL
  )
- 
-diff --git a/test/python/base/CMakeLists.txt b/test/python/base/CMakeLists.txt
-index cb9ecbf..ddd49e3 100644
---- a/test/python/base/CMakeLists.txt
-+++ b/test/python/base/CMakeLists.txt
-@@ -4,7 +4,7 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/${all_h5_files} DESTINATION ${CMAKE_CURREN
- 
- # test if MPI detection works on system
- set(testenv PYTHONPATH=${CMAKE_BINARY_DIR}/python:${CPP2PY_MODULE_DIR}:${CPP2PY_BINARY_DIR}:${h5_MODULE_DIR}:${h5_BINARY_DIR}/python:./:$ENV{PYTHONPATH})
--add_test(NAME py_check_mpi_env COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 1 ${MPIEXEC_PREFLAGS} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/check_mpi_env.py)
-+add_test(NAME py_check_mpi_env COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 1 ${MPIEXEC_PREFLAGS} ${CPP2PY_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/check_mpi_env.py)
- set_property(TEST py_check_mpi_env PROPERTY ENVIRONMENT ${testenv})
- 
- 

From 126b1ad3cdc42e9842dbec1f7162cb6bc02686af Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Mon, 24 Mar 2025 12:18:45 +0100
Subject: [PATCH 02/44] mpi version increase

---
 triqsPackages/mpi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/triqsPackages/mpi/default.nix b/triqsPackages/mpi/default.nix
index df77d0f..5398556 100644
--- a/triqsPackages/mpi/default.nix
+++ b/triqsPackages/mpi/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mpi";
-  version = "1.1.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "TRIQS";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Bey01YCW81CcW+M/EAwHhF6sUQ2+W1fOJ7vXZIz2QWA=";
+    sha256 = "sha256-reH6h2StseJyj76zNNtAP/hiekJKsCJ/m9KJCN2IRxw=";
   };
 
   patches = [ ./mpi.patch ];

From e405c5a2c4d01dc36c3c8b57552fc1f0d02cfe35 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Mon, 24 Mar 2025 16:35:18 +0100
Subject: [PATCH 03/44] update patch

---
 triqsPackages/mpi/mpi.patch | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/triqsPackages/mpi/mpi.patch b/triqsPackages/mpi/mpi.patch
index c833809..baee634 100644
--- a/triqsPackages/mpi/mpi.patch
+++ b/triqsPackages/mpi/mpi.patch
@@ -2,15 +2,7 @@ diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
 index ca0b79a..e888d57 100644
 --- a/deps/CMakeLists.txt
 +++ b/deps/CMakeLists.txt
-@@ -53,7 +53,6 @@ if(Build_Documentation)
-     GIT_REPO https://github.com/TRIQS/cpp2py
-     VERSION 2.0
-     GIT_TAG master
--    BUILD_ALWAYS
-     EXCLUDE_FROM_ALL
-   )
- endif()
-@@ -62,7 +61,6 @@ endif()
+@@ -51,7 +51,6 @@ endif()
  external_dependency(GTest
    GIT_REPO https://github.com/google/googletest
    GIT_TAG main
@@ -18,16 +10,3 @@ index ca0b79a..e888d57 100644
    EXCLUDE_FROM_ALL
  )
  
-diff --git a/test/c++/CMakeLists.txt b/test/c++/CMakeLists.txt
-index a5e32a8..940b75d 100644
---- a/test/c++/CMakeLists.txt
-+++ b/test/c++/CMakeLists.txt
-@@ -25,7 +25,7 @@ foreach(test ${all_tests})
-   get_filename_component(test_name ${test} NAME_WE)
-   get_filename_component(test_dir ${test} DIRECTORY)
-   add_executable(${test_name} ${test})
--  target_link_libraries(${test_name} ${PROJECT_NAME}::${PROJECT_NAME}_c openmp ${PROJECT_NAME}_warnings gtest_main)
-+  target_link_libraries(${test_name} ${PROJECT_NAME}::${PROJECT_NAME}_c openmp ${PROJECT_NAME}_warnings gtest gtest_main)
-   set_property(TARGET ${test_name} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
-   set(test_bin ${CMAKE_CURRENT_BINARY_DIR}/${test_dir}/${test_name})
-   add_test(NAME ${test_name}_np2 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ${test_bin} ${MPIEXEC_POSTFLAGS} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})

From 5074828a4af9e3dabc33afb4b093a4c2d872611f Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Mon, 24 Mar 2025 17:01:34 +0100
Subject: [PATCH 04/44] gtest dependency

---
 triqsPackages/mpi/mpi.patch | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/triqsPackages/mpi/mpi.patch b/triqsPackages/mpi/mpi.patch
index baee634..26061f1 100644
--- a/triqsPackages/mpi/mpi.patch
+++ b/triqsPackages/mpi/mpi.patch
@@ -1,5 +1,5 @@
 diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
-index ca0b79a..e888d57 100644
+index dd0faf8..41dac29 100644
 --- a/deps/CMakeLists.txt
 +++ b/deps/CMakeLists.txt
 @@ -51,7 +51,6 @@ endif()
@@ -10,3 +10,17 @@ index ca0b79a..e888d57 100644
    EXCLUDE_FROM_ALL
  )
  
+diff --git a/test/c++/CMakeLists.txt b/test/c++/CMakeLists.txt
+index be60f50..ccbd850 100644
+--- a/test/c++/CMakeLists.txt
++++ b/test/c++/CMakeLists.txt
+@@ -25,7 +25,7 @@ foreach(test ${all_tests})
+   get_filename_component(test_name ${test} NAME_WE)
+   get_filename_component(test_dir ${test} DIRECTORY)
+   add_executable(${test_name} ${test})
+-  target_link_libraries(${test_name} ${PROJECT_NAME}::${PROJECT_NAME}_c openmp ${PROJECT_NAME}_warnings gtest_main)
++  target_link_libraries(${test_name} ${PROJECT_NAME}::${PROJECT_NAME}_c openmp ${PROJECT_NAME}_warnings gtest)
+   set_property(TARGET ${test_name} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
+   set(test_bin ${CMAKE_CURRENT_BINARY_DIR}/${test_dir}/${test_name})
+   add_test(NAME ${test_name}_np2 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ${test_bin} ${MPIEXEC_POSTFLAGS} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
+ 

From 6ea9ec6685227777df89a29bc6c70b51425ae8ba Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Mon, 24 Mar 2025 17:56:47 +0100
Subject: [PATCH 05/44] first set of patches fixed, ld broken

---
 triqsPackages/h5/default.nix | 29 ++---------------------------
 triqsPackages/h5/h5.patch    | 28 ++++++++--------------------
 2 files changed, 10 insertions(+), 47 deletions(-)

diff --git a/triqsPackages/h5/default.nix b/triqsPackages/h5/default.nix
index f1d40d7..c5141f5 100644
--- a/triqsPackages/h5/default.nix
+++ b/triqsPackages/h5/default.nix
@@ -12,42 +12,17 @@
 
 stdenv.mkDerivation rec {
   pname = "h5";
-  version = "1.1.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "TRIQS";
     repo = pname;
     rev = version;
-    sha256 = "sha256-pqJrxsgkS+xYnEC98xBAbiw4oC72SBzS73IQBmcxjvU=";
+    sha256 = "sha256-mLO5+TdUJ85JHO0PG58wvg4lZW96MY3rpEfRC7x5jxw=";
   };
 
   patches = [
     ./h5.patch
-    (fetchpatch {
-      name = "Loosen-type-check-of-hsize_t-to-restore-hdf5-1.13-co.patch";
-      url = "https://github.com/TRIQS/h5/commit/ad98c8a33d3a7b60da2c80d02ded47629001adf8.patch";
-      sha256 = "sha256-t0EBoxllJ4LXDFC+vM79YLMWwFs6Qr5oQsiEnzj4Fww=";
-    })
-    (fetchpatch {
-      name = "cmake-Fix-h5-hdf5-interface-target-for-cmake-version.patch";
-      url = "https://github.com/TRIQS/h5/commit/cae6ca2b47ca4e01c9210d3e900120c6af4573d8.patch";
-      sha256 = "sha256-BMxgb7hArWkdwyH1fJEMcHcn7MJrhDUes0B+dC9kPdg=";
-    })
-    (fetchpatch {
-      name = "fix-np.int-np.float-np.complex-removed.patch";
-      url = "https://github.com/TRIQS/h5/commit/71a6cbfbb60c99cad17eb2bd8ae77cce9a08d5e4.patch";
-      sha256 = "sha256-beO/mTopWr7TfICQhkotOxpJObLYLCavF0QpebLBzRU=";
-    })
-    (fetchpatch {
-      name = "cmake-Fix-FindHDF5-logic-for-cmake-versions-3.23.patch";
-      url = "https://github.com/TRIQS/h5/commit/18e96270c506917bb08e10006e8ceab6d67cbbb7.patch";
-      sha256 = "sha256-tck2elNoUnjIviMZyuRZY8FAQp6XYQZF0hTe0r5uAjs=";
-    })
-    (fetchpatch {
-      name = "Fix-hsize_t-for-hdf5-versions-1.13.patch";
-      url = "https://github.com/TRIQS/h5/commit/d9af4b5b5de4c1e431bcafc55b29ef914937dc76.patch";
-      sha256 = "sha256-Qjz4EiaQcLehCccQZ5aRv/muSGX1uf7UZPAd+RDuPGI=";
-    })
   ];
   cmakeFlags = [ "-DBuild_Deps=Never" ];
   nativeBuildInputs = [ cmake gtest ];
diff --git a/triqsPackages/h5/h5.patch b/triqsPackages/h5/h5.patch
index 16961a3..faa9ed0 100644
--- a/triqsPackages/h5/h5.patch
+++ b/triqsPackages/h5/h5.patch
@@ -1,11 +1,11 @@
 diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
-index 8281e7f..061abcd 100644
+index 4993b0e..32021db 100644
 --- a/deps/CMakeLists.txt
 +++ b/deps/CMakeLists.txt
-@@ -53,7 +53,6 @@ if(PythonSupport OR Build_Documentation)
+@@ -53,7 +53,6 @@ if(PythonSupport)
      GIT_REPO https://github.com/TRIQS/cpp2py
      VERSION 2.0
-     GIT_TAG master
+     GIT_TAG unstable
 -    BUILD_ALWAYS
      EXCLUDE_FROM_ALL
    )
@@ -18,7 +18,7 @@ index 8281e7f..061abcd 100644
    EXCLUDE_FROM_ALL
  )
 diff --git a/python/h5/CMakeLists.txt b/python/h5/CMakeLists.txt
-index 03fc209..bb7fdc5 100644
+index 01f0028..e22e900 100644
 --- a/python/h5/CMakeLists.txt
 +++ b/python/h5/CMakeLists.txt
 @@ -10,6 +10,7 @@ foreach(file ${python_sources})
@@ -26,11 +26,11 @@ index 03fc209..bb7fdc5 100644
  
  # Install python files to proper location
 +set(PYTHON_LIB_DEST_ROOT ${CPP2PY_PYTHON_LIB_DEST_ROOT})
- set(PYTHON_LIB_DEST ${PYTHON_LIB_DEST_ROOT}/${PROJECT_NAME})
+ set(PYTHON_LIB_DEST ${CPP2PY_PYTHON_LIB_DEST_ROOT}/${PROJECT_NAME})
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version.py DESTINATION ${PYTHON_LIB_DEST})
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${PYTHON_LIB_DEST_ROOT} FILES_MATCHING PATTERN "*.py" PATTERN "*_desc.py" EXCLUDE)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CPP2PY_PYTHON_LIB_DEST_ROOT} FILES_MATCHING PATTERN "*.py" PATTERN "*_desc.py" EXCLUDE)
 diff --git a/test/c++/CMakeLists.txt b/test/c++/CMakeLists.txt
-index 59fca85..868a229 100644
+index 59fca85..c50f2b4 100644
 --- a/test/c++/CMakeLists.txt
 +++ b/test/c++/CMakeLists.txt
 @@ -11,7 +11,7 @@ foreach(test ${all_tests})
@@ -38,19 +38,7 @@ index 59fca85..868a229 100644
    get_filename_component(test_dir ${test} DIRECTORY)
    add_executable(${test_name} ${test})
 -  target_link_libraries(${test_name} ${PROJECT_NAME}::${PROJECT_NAME}_c ${PROJECT_NAME}_warnings gtest_main h5::hdf5)
-+  target_link_libraries(${test_name} ${PROJECT_NAME}::${PROJECT_NAME}_c ${PROJECT_NAME}_warnings gtest gtest_main h5::hdf5)
++  target_link_libraries(${test_name} ${PROJECT_NAME}::${PROJECT_NAME}_c ${PROJECT_NAME}_warnings gtest h5::hdf5)
    set_property(TARGET ${test_name} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
    add_test(NAME ${test_name} COMMAND ${test_name} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
    # Run clang-tidy if found
-diff --git a/test/python/CMakeLists.txt b/test/python/CMakeLists.txt
-index 619724b..c8f2599 100644
---- a/test/python/CMakeLists.txt
-+++ b/test/python/CMakeLists.txt
-@@ -15,6 +15,6 @@ target_include_directories(storable PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
- foreach(test ${all_tests})
-   get_filename_component(test_name ${test} NAME_WE)
-   get_filename_component(test_dir ${test} DIRECTORY)
--  add_test(NAME Py_${test_name} COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${test_dir}/${test_name}.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
-+  add_test(NAME Py_${test_name} COMMAND ${CPP2PY_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${test_dir}/${test_name}.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
-   set_property(TEST Py_${test_name} APPEND PROPERTY ENVIRONMENT PYTHONPATH=${PROJECT_BINARY_DIR}/python:${CMAKE_CURRENT_BINARY_DIR}:$ENV{PYTHONPATH} ${SANITIZER_RT_PRELOAD})
- endforeach()

From f377924cc60ebe7406f3abdc5a52ee7d05cdb6cb Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Wed, 6 Aug 2025 22:57:50 +0200
Subject: [PATCH 06/44] new version cpp2py

---
 triqsPackages/cpp2py/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/triqsPackages/cpp2py/default.nix b/triqsPackages/cpp2py/default.nix
index b184b4e..3b4be22 100644
--- a/triqsPackages/cpp2py/default.nix
+++ b/triqsPackages/cpp2py/default.nix
@@ -7,17 +7,17 @@
 }:
 
 let
-  rev = "b268654da7a06fa526be58382b4f423b84bf5fe2";
+  rev = "d5663cfbefc5302ca1e6d3292cd019f41c81966e";
 in
 stdenv.mkDerivation rec {
   pname = "cpp2py";
-  version = "2.0.0+git20220304.${builtins.substring 0 7 rev}";
+  version = "2.0.0+git20241109.${builtins.substring 0 7 rev}";
 
   src = fetchFromGitHub {
     owner = "TRIQS";
     repo = pname;
     inherit rev;
-    sha256 = "sha256-69UG1T+CRG3+fWGO5peJhGQrT1MYmt1Z64/7GCk2Vi8=";
+    sha256 = "sha256-OidPEcfOIIFEFoQEeCsPwxGWQNCSBG8ESesw/688Bw4=";
   };
 
   nativeBuildInputs = [ cmake python3Packages.wrapPython ];

From 3d6c7ccf6603da890d82d2fbb521dcff7c13c39e Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Wed, 6 Aug 2025 22:59:53 +0200
Subject: [PATCH 07/44] new dependencies

---
 triqsPackages/h5/default.nix | 2 +-
 triqsPackages/h5/h5.patch    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/triqsPackages/h5/default.nix b/triqsPackages/h5/default.nix
index c5141f5..dc85a30 100644
--- a/triqsPackages/h5/default.nix
+++ b/triqsPackages/h5/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DBuild_Deps=Never" ];
   nativeBuildInputs = [ cmake gtest ];
   buildInputs = [ triqsPackages.cpp2py hdf5 ncurses ];
-  propagatedBuildInputs = with python3Packages; [ numpy ];
+  propagatedBuildInputs = with python3Packages; [ numpy scipy mako];
 
   doCheck = true;
 
diff --git a/triqsPackages/h5/h5.patch b/triqsPackages/h5/h5.patch
index faa9ed0..9dc34dc 100644
--- a/triqsPackages/h5/h5.patch
+++ b/triqsPackages/h5/h5.patch
@@ -30,7 +30,7 @@ index 01f0028..e22e900 100644
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version.py DESTINATION ${PYTHON_LIB_DEST})
  install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CPP2PY_PYTHON_LIB_DEST_ROOT} FILES_MATCHING PATTERN "*.py" PATTERN "*_desc.py" EXCLUDE)
 diff --git a/test/c++/CMakeLists.txt b/test/c++/CMakeLists.txt
-index 59fca85..c50f2b4 100644
+index 59fca85..868a229 100644
 --- a/test/c++/CMakeLists.txt
 +++ b/test/c++/CMakeLists.txt
 @@ -11,7 +11,7 @@ foreach(test ${all_tests})
@@ -38,7 +38,7 @@ index 59fca85..c50f2b4 100644
    get_filename_component(test_dir ${test} DIRECTORY)
    add_executable(${test_name} ${test})
 -  target_link_libraries(${test_name} ${PROJECT_NAME}::${PROJECT_NAME}_c ${PROJECT_NAME}_warnings gtest_main h5::hdf5)
-+  target_link_libraries(${test_name} ${PROJECT_NAME}::${PROJECT_NAME}_c ${PROJECT_NAME}_warnings gtest h5::hdf5)
++  target_link_libraries(${test_name} ${PROJECT_NAME}::${PROJECT_NAME}_c ${PROJECT_NAME}_warnings gtest gtest_main h5::hdf5)
    set_property(TARGET ${test_name} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
    add_test(NAME ${test_name} COMMAND ${test_name} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
    # Run clang-tidy if found

From 434d487525053fed255bd5f4302fd54c8654cece Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Wed, 6 Aug 2025 23:01:51 +0200
Subject: [PATCH 08/44] new version and updated patches

---
 triqsPackages/nda/default.nix |  4 +--
 triqsPackages/nda/nda.patch   | 49 ++++++++++-------------------------
 2 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/triqsPackages/nda/default.nix b/triqsPackages/nda/default.nix
index 9a04611..1b8531b 100644
--- a/triqsPackages/nda/default.nix
+++ b/triqsPackages/nda/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nda";
-  version = "1.1.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "TRIQS";
     repo = pname;
     rev = version;
-    sha256 = "sha256-gsJ7nqNLSnH7BrGrPGp50tgFx+iGPR4cyAAK/ZQ0H8E=";
+    sha256 = "sha256-fsNWkxu3cvoOXDVNJkjBaGMlValPvYsGLbb3cNAXmZk=";
   };
 
   patches = [ ./nda.patch ];
diff --git a/triqsPackages/nda/nda.patch b/triqsPackages/nda/nda.patch
index f4a0978..c310aef 100644
--- a/triqsPackages/nda/nda.patch
+++ b/triqsPackages/nda/nda.patch
@@ -1,16 +1,17 @@
 diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
-index e23a94a..67927ca 100644
+index 66a306ba..5b59f4d7 100644
 --- a/deps/CMakeLists.txt
 +++ b/deps/CMakeLists.txt
-@@ -53,7 +53,6 @@ if(PythonSupport OR Build_Documentation)
+@@ -52,8 +52,6 @@ if(PythonSupport)
+   external_dependency(Cpp2Py
      GIT_REPO https://github.com/TRIQS/cpp2py
      VERSION 2.0
-     GIT_TAG master
+-    GIT_TAG unstable
 -    BUILD_ALWAYS
-     EXCLUDE_FROM_ALL
    )
  endif()
-@@ -62,7 +61,6 @@ endif()
+ 
+@@ -61,7 +59,6 @@ endif()
  external_dependency(GTest
    GIT_REPO https://github.com/google/googletest
    GIT_TAG main
@@ -18,48 +19,24 @@ index e23a94a..67927ca 100644
    EXCLUDE_FROM_ALL
  )
  
-@@ -72,7 +70,6 @@ if(Build_Benchs)
+@@ -71,7 +68,6 @@ if(NOT IS_SUBPROJECT AND Build_Benchs AND NOT ASAN AND NOT UBSAN)
    external_dependency(google-bench
      GIT_REPO https://github.com/google/benchmark
-     GIT_TAG v1.5.2
+     GIT_TAG main
 -    BUILD_ALWAYS
      EXCLUDE_FROM_ALL
    )
  endif()
-diff --git a/python/nda_py/CMakeLists.txt b/python/nda_py/CMakeLists.txt
-index 22a24ce..f1fb1e1 100644
---- a/python/nda_py/CMakeLists.txt
-+++ b/python/nda_py/CMakeLists.txt
-@@ -19,6 +19,7 @@ target_compile_definitions(nda_py INTERFACE
- # Install library and headers
- install(TARGETS nda_py EXPORT ${PROJECT_NAME}-targets DESTINATION lib)
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h")
-+set(PYTHON_LIB_DEST_ROOT ${CPP2PY_PYTHON_LIB_DEST_ROOT})
- set(PYTHON_LIB_DEST ${PYTHON_LIB_DEST_ROOT}/nda_py)
- install(FILES __init__.py DESTINATION ${PYTHON_LIB_DEST})
- 
 diff --git a/test/c++/CMakeLists.txt b/test/c++/CMakeLists.txt
-index 3d75dc2..5618113 100644
+index b27ebe94..d3c10e74 100644
 --- a/test/c++/CMakeLists.txt
 +++ b/test/c++/CMakeLists.txt
-@@ -14,7 +14,7 @@ foreach(test ${all_tests})
+@@ -17,7 +17,7 @@ foreach(test ${all_tests})
    #MESSAGE("${test_name} with option ${ARGV1}")
    get_filename_component(test_dir ${test} DIRECTORY)
    add_executable(${test_name} ${test})
--  target_link_libraries(${test_name} ${PROJECT_NAME}_c gtest_main ${PROJECT_NAME}_warnings)
-+  target_link_libraries(${test_name} ${PROJECT_NAME}_c gtest gtest_main ${PROJECT_NAME}_warnings)
-   #target_link_libraries(${test_name} nda_c gtest_main nda_warnings)
+-  target_link_libraries(${test_name} ${PROJECT_NAME}_c gtest_main ${PROJECT_NAME}_warnings h5::hdf5)
++  target_link_libraries(${test_name} ${PROJECT_NAME}_c gtest gtest_main ${PROJECT_NAME}_warnings h5::hdf5)
    target_compile_options(${test_name}  PRIVATE "${ARGV1}")
    set_property(TARGET ${test_name} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
-diff --git a/test/python/CMakeLists.txt b/test/python/CMakeLists.txt
-index 51aabcf..58753ca 100644
---- a/test/python/CMakeLists.txt
-+++ b/test/python/CMakeLists.txt
-@@ -22,6 +22,6 @@ set(all_tests wrap_basic_test copy_move_stat_test)
- foreach(test ${all_tests})
-   get_filename_component(test_name ${test} NAME_WE)
-   get_filename_component(test_dir ${test} DIRECTORY)
--  add_test(NAME Py_${test_name} COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${test_dir}/${test_name}.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
-+  add_test(NAME Py_${test_name} COMMAND ${CPP2PY_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${test_dir}/${test_name}.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
-   set_property(TEST Py_${test_name} APPEND PROPERTY ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}/${test_dir}:${PROJECT_BINARY_DIR}/python:${h5_BINARY_DIR}/python:$ENV{PYTHONPATH} ${SANITIZER_RT_PRELOAD})
- endforeach()
+   add_test(NAME ${test_name} COMMAND ${test_name} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})

From 8eb681855d88469650ae817802a31140416b867a Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Wed, 6 Aug 2025 23:02:07 +0200
Subject: [PATCH 09/44] add cppdlr

---
 triqsPackages/cppdlr/cppdlr.patch | 46 ++++++++++++++++++++++++++++
 triqsPackages/cppdlr/default.nix  | 50 +++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 triqsPackages/cppdlr/cppdlr.patch
 create mode 100644 triqsPackages/cppdlr/default.nix

diff --git a/triqsPackages/cppdlr/cppdlr.patch b/triqsPackages/cppdlr/cppdlr.patch
new file mode 100644
index 0000000..911643c
--- /dev/null
+++ b/triqsPackages/cppdlr/cppdlr.patch
@@ -0,0 +1,46 @@
+diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
+index 6db2571..54f2ef0 100644
+--- a/deps/CMakeLists.txt
++++ b/deps/CMakeLists.txt
+@@ -51,7 +51,6 @@ endif()
+ external_dependency(GTest
+   GIT_REPO https://github.com/google/googletest
+   GIT_TAG main
+-  BUILD_ALWAYS
+   EXCLUDE_FROM_ALL
+ )
+ 
+@@ -64,7 +63,6 @@ external_dependency(nda
+ )
+ 
+ # -- fmt --
+-set(FMT_INSTALL ON)
+ external_dependency(fmt
+   GIT_REPO https://github.com/fmtlib/fmt
+   GIT_TAG 11.0.2
+diff --git a/share/cmake/cppdlr-config.cmake.in b/share/cmake/cppdlr-config.cmake.in
+index f2cf6e6..1ab7aee 100644
+--- a/share/cmake/cppdlr-config.cmake.in
++++ b/share/cmake/cppdlr-config.cmake.in
+@@ -24,7 +24,7 @@ endfunction()
+ find_dep(nda 1.2)
+ 
+ # Include the exported targets of this project
+-include(@CMAKE_INSTALL_PREFIX@/@FMT_CMAKE_DIR@/fmt-targets.cmake)
++include(@fmt_DIR@/fmt-targets.cmake)
+ include(@CMAKE_INSTALL_FULL_LIBDIR@/cmake/@PROJECT_NAME@/@PROJECT_NAME@-targets.cmake)
+ 
+ message(STATUS "Found @PROJECT_NAME@-config.cmake with version @PROJECT_VERSION@, hash = @PROJECT_GIT_HASH@, root = @CMAKE_INSTALL_PREFIX@")
+diff --git a/test/c++/CMakeLists.txt b/test/c++/CMakeLists.txt
+index eff56af..ffe6eac 100644
+--- a/test/c++/CMakeLists.txt
++++ b/test/c++/CMakeLists.txt
+@@ -18,7 +18,7 @@ foreach(test ${all_tests})
+   get_filename_component(test_name ${test} NAME_WE)
+   get_filename_component(test_dir ${test} DIRECTORY)
+   add_executable(${test_name} ${test})
+-  target_link_libraries(${test_name} ${PROJECT_NAME}::${PROJECT_NAME}_c ${PROJECT_NAME}_warnings gtest_main)
++  target_link_libraries(${test_name} ${PROJECT_NAME}::${PROJECT_NAME}_c ${PROJECT_NAME}_warnings gtest gtest_main)
+   set_property(TARGET ${test_name} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
+   add_test(NAME ${test_name} COMMAND ${test_name} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
+   # Run clang-tidy if found
diff --git a/triqsPackages/cppdlr/default.nix b/triqsPackages/cppdlr/default.nix
new file mode 100644
index 0000000..8858158
--- /dev/null
+++ b/triqsPackages/cppdlr/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, gtest
+, triqsPackages
+, fmt
+, python3Packages
+, openblasCompat
+, hdf5
+, mpi
+, git
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cppdlr";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "flatironinstitute";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-6ZyaIAgg5Ik3IodWVZavclm1LwGLqlYPIplHjZUd8eI=";
+  };
+
+  patches = [ ./cppdlr.patch ];
+  cmakeFlags = [ "-DBuild_Deps=Never" ];
+  nativeBuildInputs = [ cmake gtest git ];
+  buildInputs = [
+    hdf5
+    mpi
+    openblasCompat
+    fmt
+  ];
+
+  propagatedBuildInputs = [
+    triqsPackages.cpp2py
+    triqsPackages.h5
+    triqsPackages.nda
+    triqsPackages.itertools
+    triqsPackages.mpi
+  ];
+
+  meta = {
+    description = "Discrete Lehmann representation of imaginary time Green's functions";
+    homepage = "https://github.com/flatironinstitute/cppdlr";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hmenke ];
+  };
+}

From f3cc4212d70d01597e81c3b21a8d3be6b379c197 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Wed, 6 Aug 2025 23:02:35 +0200
Subject: [PATCH 10/44] missing include for cppdlr

---
 triqsPackages/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/triqsPackages/default.nix b/triqsPackages/default.nix
index 0ab6be9..e9eb1a3 100644
--- a/triqsPackages/default.nix
+++ b/triqsPackages/default.nix
@@ -16,6 +16,8 @@ recurseIntoAttrs ({
 
   nda = callPackage ./nda { };
 
+  cppdlr = callPackage ./cppdlr { };
+
   tprf = callPackage ./tprf { };
 
   triqs = callPackage ./triqs { };

From ec579ef36409a943847bc47ba76b6cf66b7ae882 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Fri, 8 Aug 2025 12:24:17 +0200
Subject: [PATCH 11/44] correct dependency for triqs 3.3 release

---
 triqsPackages/cppdlr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/triqsPackages/cppdlr/default.nix b/triqsPackages/cppdlr/default.nix
index 8858158..2b49340 100644
--- a/triqsPackages/cppdlr/default.nix
+++ b/triqsPackages/cppdlr/default.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   pname = "cppdlr";
-  version = "1.2.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "flatironinstitute";

From 745ba2516e8e073c457f098d640bf8b04c7044bd Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Fri, 8 Aug 2025 12:25:07 +0200
Subject: [PATCH 12/44] Add python support for triqs tests

---
 triqsPackages/nda/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/triqsPackages/nda/default.nix b/triqsPackages/nda/default.nix
index 1b8531b..17bd171 100644
--- a/triqsPackages/nda/default.nix
+++ b/triqsPackages/nda/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [ ./nda.patch ];
-  cmakeFlags = [ "-DBuild_Deps=Never" ];
+  cmakeFlags = [ "-DBuild_Deps=Never" "-DPythonSupport=ON" ];
   nativeBuildInputs = [ cmake gtest ];
   buildInputs = [
     triqsPackages.cpp2py
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     openblasCompat
     ncurses
   ];
-  propagatedBuildInputs = with python3Packages; [ numpy ];
+  propagatedBuildInputs = with python3Packages; [ numpy mako scipy ];
 
   checkInputs = [ openssh ];
   doCheck = true;

From 2efd0eeb6aa853d31b035572dde33ec751c4173c Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Fri, 8 Aug 2025 12:25:37 +0200
Subject: [PATCH 13/44] new dependencies for 3.3

---
 triqsPackages/triqs/default.nix | 10 ++++++++--
 triqsPackages/triqs/triqs.patch | 24 ++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/triqsPackages/triqs/default.nix b/triqsPackages/triqs/default.nix
index 6a88e6d..7a1bea1 100644
--- a/triqsPackages/triqs/default.nix
+++ b/triqsPackages/triqs/default.nix
@@ -2,7 +2,7 @@
 , lib
 , fetchFromGitHub
 , fetchpatch
-, gcc12
+, gcc13
 , cmake
 , gtest
 , fmt
@@ -14,6 +14,8 @@
 , ncurses
 , openblasCompat
 , openssh
+, git
+, hdf5
 }:
 
 stdenv.mkDerivation rec {
@@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
   patches = [
     ./triqs.patch
   ];
-  nativeBuildInputs = [ gcc12 cmake gtest fmt python3Packages.wrapPython triqsPackages.itertools ];
+  nativeBuildInputs = [ gcc13 cmake gtest fmt python3Packages.wrapPython triqsPackages.itertools ];
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBuild_Deps=Never" ];
   buildInputs = [
     boost
@@ -38,6 +40,9 @@ stdenv.mkDerivation rec {
     gmp
     ncurses
     openblasCompat
+    git
+    hdf5
+    fmt
   ];
   pythonPath = with python3Packages; [ numpy matplotlib mpi4py Mako scipy ];
   propagatedBuildInputs = [
@@ -46,6 +51,7 @@ stdenv.mkDerivation rec {
     triqsPackages.nda
     triqsPackages.itertools
     triqsPackages.mpi
+    triqsPackages.cppdlr
   ] ++ pythonPath;
   postFixup = "wrapPythonPrograms";
 
diff --git a/triqsPackages/triqs/triqs.patch b/triqsPackages/triqs/triqs.patch
index 8c012fe..47576a0 100644
--- a/triqsPackages/triqs/triqs.patch
+++ b/triqsPackages/triqs/triqs.patch
@@ -1,11 +1,31 @@
 diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
-index cb56367..187f209 100644
+index f1ef146d..1e9cad94 100644
 --- a/deps/CMakeLists.txt
 +++ b/deps/CMakeLists.txt
-@@ -64,6 +64,5 @@ endif()
+@@ -64,7 +64,6 @@ endif()
  external_dependency(GTest
    GIT_REPO https://github.com/google/googletest
    GIT_TAG main
 -  BUILD_ALWAYS
    EXCLUDE_FROM_ALL
  )
+ 
+@@ -74,18 +73,15 @@ if(Build_Benchs)
+   external_dependency(google-bench
+     GIT_REPO https://github.com/google/benchmark
+     GIT_TAG main
+-    BUILD_ALWAYS
+     EXCLUDE_FROM_ALL
+   )
+ endif()
+ 
+ # -- fmt --
+-set(FMT_INSTALL ON)
+ external_dependency(fmt
+   GIT_REPO https://github.com/fmtlib/fmt
+   GIT_TAG 10.2.1
+ )
+-target_compile_options(fmt PRIVATE $<$<CXX_COMPILER_ID:IntelLLVM>:-Wno-tautological-constant-compare>)
+ 
+ # -- itertools --
+ external_dependency(itertools

From c1fc95b49f9c4ba071743c2fbcd297fe9c473ae1 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Fri, 8 Aug 2025 13:22:36 +0200
Subject: [PATCH 14/44] version bump

---
 nfft/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nfft/default.nix b/nfft/default.nix
index 51ac130..aa43309 100644
--- a/nfft/default.nix
+++ b/nfft/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nfft";
-  version = "3.5.2";
+  version = "3.5.3";
 
   src = fetchFromGitHub {
     owner = "NFFT";
     repo = pname;
     rev = version;
-    sha256 = "sha256:1liphapa64c16pw3dz2mqdq31jv5r01prdh1289616cvb1kp4232";
+    sha256 = "sha256-HR8ME9PVC+RAv1GIgV2vK6eLU8Wk28+rSzbutThBv3w=";
   };
   patches = [
     ./ac-check-decls.patch

From ab4490f96c63463c67dd6602d8faf09f321056a1 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Fri, 8 Aug 2025 15:43:22 +0200
Subject: [PATCH 15/44] bump flake

---
 flake.lock | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 368ab43..9b60e08 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,12 +1,15 @@
 {
   "nodes": {
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1653893745,
-        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -17,12 +20,10 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1654360807,
-        "narHash": "sha256-itZTrtHeDJjV696+ur0/TzkTqb5y3Eb57WRLRPK3rwA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0938d73bb143f4ae037143572f11f4338c7b2d1c",
-        "type": "github"
+        "lastModified": 0,
+        "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=",
+        "path": "/nix/store/n67nldl8x3f44w9mvk5zvij0q1rwnsmq-source",
+        "type": "path"
       },
       "original": {
         "id": "nixpkgs",
@@ -34,6 +35,21 @@
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

From 71db52ad3b678f927d98075843089cdeff397b1c Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Fri, 8 Aug 2025 15:43:36 +0200
Subject: [PATCH 16/44] fmt search for triqs

---
 triqsPackages/triqs/triqs.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/triqsPackages/triqs/triqs.patch b/triqsPackages/triqs/triqs.patch
index 47576a0..d26553b 100644
--- a/triqsPackages/triqs/triqs.patch
+++ b/triqsPackages/triqs/triqs.patch
@@ -1,3 +1,16 @@
+diff --git a/cmake/TRIQSConfig.cmake.in b/cmake/TRIQSConfig.cmake.in
+index 2eb8b521..a0abc33d 100644
+--- a/cmake/TRIQSConfig.cmake.in
++++ b/cmake/TRIQSConfig.cmake.in
+@@ -80,7 +80,7 @@ add_library(triqs_py INTERFACE)
+ target_link_libraries(triqs_py INTERFACE nda::nda_py)
+ 
+ # Include the exported targets of this project
+-include(@CMAKE_INSTALL_PREFIX@/@FMT_CMAKE_DIR@/fmt-targets.cmake)
++include(@fmt_DIR@/fmt-targets.cmake)
+ include(@CMAKE_INSTALL_FULL_LIBDIR@/cmake/triqs/triqs-targets.cmake)
+ 
+ message(STATUS "Found TRIQSConfig.cmake with version @PROJECT_VERSION@, hash = @TRIQS_GIT_HASH@, root = @CMAKE_INSTALL_PREFIX@")
 diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
 index f1ef146d..1e9cad94 100644
 --- a/deps/CMakeLists.txt

From 76b8ba4a6b9306d7e1da9cd57cf4262cb43274ff Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Fri, 8 Aug 2025 15:43:53 +0200
Subject: [PATCH 17/44] update cthyb for 3.3

---
 triqsPackages/cthyb/cthyb.patch | 6 +++---
 triqsPackages/cthyb/default.nix | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/triqsPackages/cthyb/cthyb.patch b/triqsPackages/cthyb/cthyb.patch
index 0f778d1..0b852ab 100644
--- a/triqsPackages/cthyb/cthyb.patch
+++ b/triqsPackages/cthyb/cthyb.patch
@@ -1,11 +1,11 @@
 diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
-index 8281e7f..061abcd 100644
+index e26dfba..103369b 100644
 --- a/deps/CMakeLists.txt
 +++ b/deps/CMakeLists.txt
-@@ -53,7 +53,6 @@ if(PythonSupport OR Build_Documentation)
+@@ -53,7 +53,6 @@ if(PythonSupport OR (NOT IS_SUBPROJECT AND Build_Documentation))
      GIT_REPO https://github.com/TRIQS/cpp2py
      VERSION 2.0
-     GIT_TAG master
+     GIT_TAG unstable
 -    BUILD_ALWAYS
      EXCLUDE_FROM_ALL
    )
diff --git a/triqsPackages/cthyb/default.nix b/triqsPackages/cthyb/default.nix
index ab4005a..80fc54c 100644
--- a/triqsPackages/cthyb/default.nix
+++ b/triqsPackages/cthyb/default.nix
@@ -7,23 +7,24 @@
 , ncurses
 , nfft
 , openssh
+, boost
 }:
 
 stdenv.mkDerivation rec {
   pname = "cthyb";
-  version = "3.1.1";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "TRIQS";
     repo = pname;
     rev = version;
-    sha256 = "sha256-FQpWAzW0DHmZGzLb6j/OSmm2Df9/WabRiqFAk8T8quQ=";
+    sha256 = "sha256-bZfjK08MsW/ZK6c2STi+pJAZjR/uJbV4UnMa6/hBzQA=";
   };
 
   patches = [ ./cthyb.patch ];
   nativeBuildInputs = [ cmake gtest ];
   cmakeFlags = [ "-DBuild_Deps=Never" ];
-  buildInputs = [ ncurses nfft ];
+  buildInputs = [ ncurses nfft boost ];
   propagatedBuildInputs = [ triqsPackages.triqs ];
 
   checkInputs = [ openssh ];

From 4b2bdae756bb6de3ae4f37af5bcaef8dcbe4ae1b Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Fri, 8 Aug 2025 15:44:09 +0200
Subject: [PATCH 18/44] changes for 3.3.1

---
 triqsPackages/tprf/default.nix | 7 ++++---
 triqsPackages/tprf/tprf.patch  | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/triqsPackages/tprf/default.nix b/triqsPackages/tprf/default.nix
index 8b70064..cbc7389 100644
--- a/triqsPackages/tprf/default.nix
+++ b/triqsPackages/tprf/default.nix
@@ -7,23 +7,24 @@
 , triqsPackages
 , ncurses
 , openssh
+, boost
 }:
 
 stdenv.mkDerivation rec {
   pname = "tprf";
-  version = "3.1.1";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "TRIQS";
     repo = pname;
     rev = version;
-    sha256 = "sha256-zgSX1sliQ6QYNx/D1WZ6cRuYHN/UJYnQfOVi3WDda4k=";
+    sha256 = "sha256-0cgf5O4junHmMOljzi8xVx/BkLHOCzK36nK8oOy1NC0=";
   };
 
   patches = [ ./tprf.patch ];
   nativeBuildInputs = [ cmake gtest ];
   cmakeFlags = [ "-DBuild_Deps=Never" ];
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses boost ];
   propagatedBuildInputs = [ triqsPackages.triqs ];
 
   checkInputs = [ openssh ];
diff --git a/triqsPackages/tprf/tprf.patch b/triqsPackages/tprf/tprf.patch
index 1e6233f..bb9ed24 100644
--- a/triqsPackages/tprf/tprf.patch
+++ b/triqsPackages/tprf/tprf.patch
@@ -1,11 +1,11 @@
 diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
-index 8281e7f..061abcd 100644
+index e26dfba..103369b 100644
 --- a/deps/CMakeLists.txt
 +++ b/deps/CMakeLists.txt
-@@ -53,7 +53,6 @@ if(PythonSupport OR Build_Documentation)
+@@ -53,7 +53,6 @@ if(PythonSupport OR (NOT IS_SUBPROJECT AND Build_Documentation))
      GIT_REPO https://github.com/TRIQS/cpp2py
      VERSION 2.0
-     GIT_TAG master
+     GIT_TAG unstable
 -    BUILD_ALWAYS
      EXCLUDE_FROM_ALL
    )

From c43bd809c3918481a85c9b2b97dcee2bb4d1d355 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Fri, 8 Aug 2025 16:20:31 +0200
Subject: [PATCH 19/44] maxent -> 3.3.0

---
 triqsPackages/maxent/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/triqsPackages/maxent/default.nix b/triqsPackages/maxent/default.nix
index 1430555..0810f84 100644
--- a/triqsPackages/maxent/default.nix
+++ b/triqsPackages/maxent/default.nix
@@ -5,20 +5,22 @@
 , triqsPackages
 , python3Packages
 , openssh
+, boost
 }:
 
 stdenv.mkDerivation rec {
   pname = "maxent";
-  version = "1.1.1";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "TRIQS";
     repo = pname;
     rev = version;
-    sha256 = "sha256-To/4TMZ4mbiS3UjfZkbGqABT1q4MR/oUdW54Hmk6THU=";
+    sha256 = "sha256-mnUYLV55D6A+ojBZt+83xK7qOQQ4Rsr+4TJwUFvoERk=";
   };
 
   nativeBuildInputs = [ cmake python3Packages.wrapPython ];
+  buildInputs = [ boost ];
   pythonPath = [ python3Packages.decorator ];
   propagatedBuildInputs = pythonPath ++ [ triqsPackages.triqs ];
 

From e70700073510b8f1742cb8c3e2fab55cf4dafb70 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Mon, 11 Aug 2025 20:07:29 +0200
Subject: [PATCH 20/44] pyed new release

---
 triqsPackages/pyed/default.nix | 11 +++++------
 triqsPackages/pyed/pyed.patch  | 13 +++++++++++++
 2 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 triqsPackages/pyed/pyed.patch

diff --git a/triqsPackages/pyed/default.nix b/triqsPackages/pyed/default.nix
index 02b99d1..6738cb3 100644
--- a/triqsPackages/pyed/default.nix
+++ b/triqsPackages/pyed/default.nix
@@ -6,20 +6,19 @@
 , triqsPackages
 , pytestCheckHook
 }:
-let
-  rev = "6359be4f287bddd67db3a50960880de6b645f008";
-in
 buildPythonPackage rec {
   pname = "pyed";
-  version = "1.0+git20220317.${builtins.substring 0 7 rev}";
+  version = "0.0.1";
 
   src = fetchFromGitHub {
     owner = "HugoStrand";
     repo = pname;
-    inherit rev;
-    sha256 = "sha256-/jHUbN6oEfSYRjJf8ap1xF4a5Vz27lNLaqM/RV8G4Sg=";
+    rev = version;
+    sha256 = "sha256-/i2h56ISQqUIVXfSclgRWq4mgv9yzdqb9KpHyEBJZXw=";
   };
 
+  patches = [ ./pyed.patch ];
+
   propagatedBuildInputs = [ numpy scipy triqsPackages.triqs ];
 
   checkInputs = [ pytestCheckHook ];
diff --git a/triqsPackages/pyed/pyed.patch b/triqsPackages/pyed/pyed.patch
new file mode 100644
index 0000000..dcfdce8
--- /dev/null
+++ b/triqsPackages/pyed/pyed.patch
@@ -0,0 +1,13 @@
+diff --git a/pyed/tests/test_operator_utils.py b/pyed/tests/test_operator_utils.py
+index dc1f654..b8e1a65 100644
+--- a/pyed/tests/test_operator_utils.py
++++ b/pyed/tests/test_operator_utils.py
+@@ -13,7 +13,7 @@ import numpy as np
+ 
+ from triqs.operators import n, c, c_dag, Operator, dagger
+ 
+-from triqs.operators.util.U_matrix import U_matrix_kanamori, U_matrix
++from triqs.operators.util.U_matrix import U_matrix_kanamori
+ from triqs.operators.util.hamiltonians import h_int_kanamori
+ 
+ from transform_kanamori import h_int_kanamori_transformed

From 42a0dfae89f4a621e3dcd20f4029f1dcfbb9eee0 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Mon, 11 Aug 2025 20:07:58 +0200
Subject: [PATCH 21/44] new version for omegamaxent interface

---
 .../omegamaxent_interface/default.nix         |  7 ++++---
 .../omegamaxent_interface.patch               | 19 +++----------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/triqsPackages/omegamaxent_interface/default.nix b/triqsPackages/omegamaxent_interface/default.nix
index 716550c..e4b51cb 100644
--- a/triqsPackages/omegamaxent_interface/default.nix
+++ b/triqsPackages/omegamaxent_interface/default.nix
@@ -8,23 +8,24 @@
 , openblasCompat
 , triqsPackages
 , openssh
+, boost
 }:
 
 stdenv.mkDerivation rec {
   pname = "omegamaxent_interface";
-  version = "3.1.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "TRIQS";
     repo = pname;
     rev = version;
-    sha256 = "sha256-k6SsNuYFOmxN0K/jysYzA3ONHR2QIzFDe+f1Jjulngo=";
+    sha256 = "sha256-2FyrBluCN8Mqp7UZhbQb1Ryjva+5p8vgCN3cUtisl20=";
   };
   patches = [ ./omegamaxent_interface.patch ];
 
   nativeBuildInputs = [ cmake gtest ];
   cmakeFlags = [ "-DBuild_Deps=Never" ];
-  buildInputs = [ fftw gsl openblasCompat ];
+  buildInputs = [ fftw gsl openblasCompat boost ];
   propagatedBuildInputs = [ triqsPackages.triqs ];
 
   enableParallelChecking = false;
diff --git a/triqsPackages/omegamaxent_interface/omegamaxent_interface.patch b/triqsPackages/omegamaxent_interface/omegamaxent_interface.patch
index f6f8ee9..dec61bc 100644
--- a/triqsPackages/omegamaxent_interface/omegamaxent_interface.patch
+++ b/triqsPackages/omegamaxent_interface/omegamaxent_interface.patch
@@ -1,11 +1,11 @@
 diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
-index 8281e7f..061abcd 100644
+index e26dfba..103369b 100644
 --- a/deps/CMakeLists.txt
 +++ b/deps/CMakeLists.txt
-@@ -53,7 +53,6 @@ if(PythonSupport OR Build_Documentation)
+@@ -53,7 +53,6 @@ if(PythonSupport OR (NOT IS_SUBPROJECT AND Build_Documentation))
      GIT_REPO https://github.com/TRIQS/cpp2py
      VERSION 2.0
-     GIT_TAG master
+     GIT_TAG unstable
 -    BUILD_ALWAYS
      EXCLUDE_FROM_ALL
    )
@@ -17,16 +17,3 @@ index 8281e7f..061abcd 100644
 -  BUILD_ALWAYS
    EXCLUDE_FROM_ALL
  )
-diff --git a/python/OmegaMaxEnt_TRIQS.py b/python/OmegaMaxEnt_TRIQS.py
-index 67733b3..acd6808 100644
---- a/python/OmegaMaxEnt_TRIQS.py
-+++ b/python/OmegaMaxEnt_TRIQS.py
-@@ -29,7 +29,7 @@ from triqs.gf import *
- from h5 import HDFArchive as HA
- import os
- from os import path
--from collections import Iterable
-+from collections.abc import Iterable
- 
- tol_Gi_tau = 1e-8
- 

From 99e553bcc7177da8b40a60c4acf4213be79a9253 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Sat, 23 Aug 2025 21:05:26 +0200
Subject: [PATCH 22/44] added dependency necessary for import wo triqs

---
 triqsPackages/tprf/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/triqsPackages/tprf/default.nix b/triqsPackages/tprf/default.nix
index cbc7389..745f591 100644
--- a/triqsPackages/tprf/default.nix
+++ b/triqsPackages/tprf/default.nix
@@ -8,6 +8,7 @@
 , ncurses
 , openssh
 , boost
+, gmp
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
   patches = [ ./tprf.patch ];
   nativeBuildInputs = [ cmake gtest ];
   cmakeFlags = [ "-DBuild_Deps=Never" ];
-  buildInputs = [ ncurses boost ];
+  buildInputs = [ ncurses boost gmp ];
   propagatedBuildInputs = [ triqsPackages.triqs ];
 
   checkInputs = [ openssh ];

From f800da83ab7a3b333a0b5d4dac923b3461a7ff6a Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Mon, 25 Aug 2025 14:12:16 +0200
Subject: [PATCH 23/44] moved tprf buildinputs to triqs propagated

---
 triqsPackages/tprf/default.nix  | 7 +++----
 triqsPackages/triqs/default.nix | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/triqsPackages/tprf/default.nix b/triqsPackages/tprf/default.nix
index 745f591..ac9474e 100644
--- a/triqsPackages/tprf/default.nix
+++ b/triqsPackages/tprf/default.nix
@@ -5,10 +5,7 @@
 , cmake
 , gtest
 , triqsPackages
-, ncurses
 , openssh
-, boost
-, gmp
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +22,9 @@ stdenv.mkDerivation rec {
   patches = [ ./tprf.patch ];
   nativeBuildInputs = [ cmake gtest ];
   cmakeFlags = [ "-DBuild_Deps=Never" ];
-  buildInputs = [ ncurses boost gmp ];
+  # Documentation specifies 'a working triqs installation,
+  # such that we moved the buildinputs were moved to triqs propagatedBuildInputs'
+  buildInputs = [  ];
   propagatedBuildInputs = [ triqsPackages.triqs ];
 
   checkInputs = [ openssh ];
diff --git a/triqsPackages/triqs/default.nix b/triqsPackages/triqs/default.nix
index 7a1bea1..85076ab 100644
--- a/triqsPackages/triqs/default.nix
+++ b/triqsPackages/triqs/default.nix
@@ -35,10 +35,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ gcc13 cmake gtest fmt python3Packages.wrapPython triqsPackages.itertools ];
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBuild_Deps=Never" ];
   buildInputs = [
-    boost
-    fftw
-    gmp
-    ncurses
     openblasCompat
     git
     hdf5
@@ -46,6 +42,9 @@ stdenv.mkDerivation rec {
   ];
   pythonPath = with python3Packages; [ numpy matplotlib mpi4py Mako scipy ];
   propagatedBuildInputs = [
+    boost
+    fftw
+    gmp
     triqsPackages.cpp2py
     triqsPackages.h5
     triqsPackages.nda

From 90f08ad6859a8aef5d89875a54e89d0b24950e6c Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Mon, 25 Aug 2025 16:03:29 +0200
Subject: [PATCH 24/44] tprf needs hdf5

---
 triqsPackages/triqs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/triqsPackages/triqs/default.nix b/triqsPackages/triqs/default.nix
index 85076ab..717ed0c 100644
--- a/triqsPackages/triqs/default.nix
+++ b/triqsPackages/triqs/default.nix
@@ -37,11 +37,11 @@ stdenv.mkDerivation rec {
   buildInputs = [
     openblasCompat
     git
-    hdf5
     fmt
   ];
   pythonPath = with python3Packages; [ numpy matplotlib mpi4py Mako scipy ];
   propagatedBuildInputs = [
+    hdf5
     boost
     fftw
     gmp

From 00828c0ec2ae5e4cbab15b669d3202ea9c3e3f62 Mon Sep 17 00:00:00 2001
From: Paul Fadler <58314121+pfadler@users.noreply.github.com>
Date: Mon, 22 Sep 2025 11:31:17 +0200
Subject: [PATCH 25/44] amend sha of cppdlr

---
 triqsPackages/cppdlr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/triqsPackages/cppdlr/default.nix b/triqsPackages/cppdlr/default.nix
index 2b49340..6cd2329 100644
--- a/triqsPackages/cppdlr/default.nix
+++ b/triqsPackages/cppdlr/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     owner = "flatironinstitute";
     repo = pname;
     rev = version;
-    sha256 = "sha256-6ZyaIAgg5Ik3IodWVZavclm1LwGLqlYPIplHjZUd8eI=";
+    sha256 = "sha256-PxZtJifJotQtON+bEVGelXl/G9jxxfV5WmD6UJlhtLU=";
   };
 
   patches = [ ./cppdlr.patch ];

From 190851ecbfe1ea419bb4f8e7ac493d9abe558647 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Sun, 28 Sep 2025 19:04:45 +0200
Subject: [PATCH 26/44] New version necessitates fftwf

---
 w2dynamics/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/w2dynamics/default.nix b/w2dynamics/default.nix
index 01c54d1..51f61fb 100644
--- a/w2dynamics/default.nix
+++ b/w2dynamics/default.nix
@@ -6,6 +6,7 @@
 , gfortran
 , openblasCompat
 , fftw
+, fftwFloat
 , nfft
 , python3
 , python3Packages
@@ -13,30 +14,22 @@
 
 stdenv.mkDerivation rec {
   pname = "w2dynamics";
-  version = "1.1.3";
+  version = "1.1.6";
 
   src = fetchFromGitHub {
     owner = "w2dynamics";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-4py4xBVD6kN8D/If+bXn+4OjwI1n6m1M1puZbA3fBbE=";
+    sha256 = "sha256-sBLSui+FFn5js+Ri6kcXcOEv5J/3Z0cXrhGlHdLFLnA=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "Rename-end-to-endp-in-CTQMC.F90-as-workaround-for-f2py";
-      url = "https://github.com/w2dynamics/w2dynamics/commit/d02d8c9973fec34540061ea3ec5705bbd25bdc5b.patch";
-      sha256 = "sha256-gszDgaONdRXGdL2dJa4TukFubxO1Wel4V34pTu1RSdw=";
-    })
-  ];
-
   nativeBuildInputs = [ cmake python3Packages.wrapPython ];
 
   cmakeFlags = [ "-DUSE_NFFT=1" ];
 
   enableParallelBuilding = false;
 
-  buildInputs = [ gfortran openblasCompat fftw nfft ];
+  buildInputs = [ gfortran openblasCompat fftw fftwFloat nfft ];
 
   pythonPath = with python3Packages; [ numpy scipy h5py mpi4py configobj ];
   propagatedBuildInputs = pythonPath;

From 28054d7466ee63110d620e1b35eab71faa862508 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Sun, 28 Sep 2025 19:30:40 +0200
Subject: [PATCH 27/44] some issues with gtest and cpp11

---
 pomerolPackages/gftools/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pomerolPackages/gftools/default.nix b/pomerolPackages/gftools/default.nix
index 79b009e..e766947 100644
--- a/pomerolPackages/gftools/default.nix
+++ b/pomerolPackages/gftools/default.nix
@@ -13,21 +13,21 @@ stdenv.mkDerivation rec {
   version = "2022.03";
 
   src = fetchFromGitHub {
-    owner = "aeantipov";
+    owner = "pomerol-ed";
     repo = pname;
     rev = version;
     sha256 = "sha256-miaG9vw1w+7w1+MMl1f/Yn/0B1IUt6CPWww3BeDNrLA=";
   };
 
   nativeBuildInputs = [ cmake gtest ];
-  cmakeFlags = [ "-DTesting=ON" "-DExamples=ON" ];
+  cmakeFlags = [ "-DTesting=OFF" "-DExamples=ON" ];
   buildInputs = [ boost eigen ];
 
-  doCheck = true;
+  doCheck = false;
 
   meta = {
     description = "gftools is a set of tools to work with numerical condmat problems";
-    homepage = "https://github.com/aeantipov/gftools";
+    homepage = "https://github.com/pomerol-ed/gftools";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ hmenke ];
   };

From 65ba207165b2c5c6c1701e190ccd0d8b2a9e83c7 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Sun, 28 Sep 2025 19:35:26 +0200
Subject: [PATCH 28/44] new version

---
 pomerolPackages/libcommute/default.nix | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/pomerolPackages/libcommute/default.nix b/pomerolPackages/libcommute/default.nix
index 9d80c09..561d0a6 100644
--- a/pomerolPackages/libcommute/default.nix
+++ b/pomerolPackages/libcommute/default.nix
@@ -8,32 +8,15 @@
 
 stdenv.mkDerivation rec {
   pname = "libcommute";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "krivenko";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-wpA0Rnv8ROku7ikncCby7rftFDUeNxO/AONS/0/ibLg=";
+    sha256 = "sha256-BGn5q6sqVqWKiZDEqWw1ZLCAVoY2gIHFyx00BB3HGmE=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-install-CMake-config-in-subdirectory.patch";
-      url = "https://github.com/krivenko/libcommute/commit/2e3202a278efc938be7d1241becc9d3f26d3f03e.patch";
-      sha256 = "sha256-LLdV55Jd6V4tIQN+glxb5MqP7BdyjpXEct6cjP0kfBg=";
-    })
-    (fetchpatch {
-      name = "doc-Consistently-use-lowercased-libcommute-in-CMake-.patch";
-      url = "https://github.com/krivenko/libcommute/commit/863b67380742b4431b9170fbcdf51ff81172db0e.patch";
-      sha256 = "sha256-+Gb8K/xjPnTmS8MYVSzimLS00rZJHY89kkNOzSOKryI=";
-    })
-    (fetchpatch {
-      name = "test-Upgrade-bundled-Catch2-to-v2.13.9-fix-2.patch";
-      url = "https://github.com/krivenko/libcommute/commit/98624b3b57875711f5958ee168e65d809c31bcbb.patch";
-      sha256 = "sha256-1IuVKH1+7+ETDg+cebtbMySyvJs1d9x6ferxBBgn9pg=";
-    })
-  ];
   nativeBuildInputs = [ cmake ];
   buildInputs = [ eigen ];
 

From f536b17d3a77d581085a0e56d2749114d19bbaa6 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Sun, 28 Sep 2025 19:56:41 +0200
Subject: [PATCH 29/44] new pomerol version

---
 pomerolPackages/pomerol/default.nix   | 24 ++++++++----------------
 pomerolPackages/pomerol/mpitest.patch | 13 +++++++++++++
 2 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 pomerolPackages/pomerol/mpitest.patch

diff --git a/pomerolPackages/pomerol/default.nix b/pomerolPackages/pomerol/default.nix
index 0fe78c3..06a9c46 100644
--- a/pomerolPackages/pomerol/default.nix
+++ b/pomerolPackages/pomerol/default.nix
@@ -13,27 +13,19 @@
 
 stdenv.mkDerivation rec {
   pname = "pomerol";
-  version = "2.0";
+  version = "2.2";
 
   src = fetchFromGitHub {
-    owner = "aeantipov";
+    owner = "pomerol-ed";
     repo = pname;
     rev = version;
-    sha256 = "sha256-RlpcPVsLuvMeECpVp92nODDij9+tciySdUCOqrqFtvA=";
+    sha256 = "sha256-s65GSNZcV2virhc6WquhhdNs7YojendQSDHQycSsi7I=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-quantum_model-is-not-a-valid-prog.patch";
-      url = "https://github.com/aeantipov/pomerol/commit/a7dee04938584c05dd827becd906e4a1483f5b53.patch";
-      sha256 = "sha256-/QEzacrSnSsxeyjAHVH0N3bJFxQf2TgfGl88MqBctQ0=";
-    })
-    (fetchpatch {
-      name = "CI-Update-value-of-libcommute_DIR-CMake-var-after-kr.patch";
-      url = "https://github.com/aeantipov/pomerol/commit/6de692ba27109972b279085f6c2bf6bbad2fc986.patch";
-      sha256 = "sha256-iI+E8oFuasFf5KIc/TvyisOarSY5nEb1/o9QfLGGexM=";
-    })
-  ];
+  # The tests will fail, if it is impossible to spawn 16 mpi processes
+  # this patch will limit it to a reasonable 4
+  patches = [ ./mpitest.patch ];
+
   nativeBuildInputs = [ cmake gtest ];
   cmakeFlags = [
     "-DTesting=ON"
@@ -55,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Exact diagonalization code for solving condensed matter second-quantized models of interacting fermions on finite size lattices at finite temperatures";
-    homepage = "https://aeantipov.github.io/pomerol/";
+    homepage = "https://github.com/pomerol-ed/pomerol";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ hmenke ];
   };
diff --git a/pomerolPackages/pomerol/mpitest.patch b/pomerolPackages/pomerol/mpitest.patch
new file mode 100644
index 0000000..d06dbb5
--- /dev/null
+++ b/pomerolPackages/pomerol/mpitest.patch
@@ -0,0 +1,13 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index f69cb10b..c6e4f620 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -51,7 +51,7 @@ foreach(test ${mpi_tests})
+     target_link_libraries(${test} PRIVATE
+                           ${PROJECT_NAME} ${MPI_CXX_LIBRARIES} catch2-pomerol)
+ 
+-    foreach(np 2 4 8 16)
++    foreach(np 2 4)
+         set(test_parameters
+             ${MPIEXEC_NUMPROC_FLAG} ${np}
+             ${MPIEXEC_PREFLAGS} ${test} ${MPIEXEC_POSTFLAGS})

From 4c0bb34a1d1ff4ef02ddd6db9038550440bdb751 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Sun, 28 Sep 2025 20:00:17 +0200
Subject: [PATCH 30/44] new interface version

---
 pomerolPackages/pomerol2triqs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pomerolPackages/pomerol2triqs/default.nix b/pomerolPackages/pomerol2triqs/default.nix
index 6c32c95..765a653 100644
--- a/pomerolPackages/pomerol2triqs/default.nix
+++ b/pomerolPackages/pomerol2triqs/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pomerol2triqs";
-  version = "0.7";
+  version = "0.10";
 
   src = fetchFromGitHub {
-    owner = "krivenko";
+    owner = "pomerol-ed";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-na/jDQkbSaT36VXu02Xg1y8DvUeKH2gf46frkvW16iU=";
+    sha256 = "sha256-MQOzvqIwE0nMnfDyiUaXiNuOif4ksqBefMAgJE4y8qo=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Quick and dirty TRIQS wrapper around the Pomerol exact diagonalization library";
-    homepage = "https://github.com/krivenko/pomerol2triqs";
+    homepage = "https://github.com/pomerol-ed/pomerol2triqs";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ hmenke ];
   };

From e07dd7d231d24cadb48cd5a90a615af1b04e2910 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Mon, 29 Sep 2025 20:53:00 +0200
Subject: [PATCH 31/44] new alps version

---
 alpsPackages/alpsCore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alpsPackages/alpsCore/default.nix b/alpsPackages/alpsCore/default.nix
index 3dc2f93..407c9d3 100644
--- a/alpsPackages/alpsCore/default.nix
+++ b/alpsPackages/alpsCore/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ALPSCore";
-  version = "2.2.0";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "ALPSCore";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256:0brnbly6p227x2lw28rlx9wl64yff3x13wfy9kwl9jjil97r6ryl";
+    sha256 = "sha256-0fsFxA2nB5XQezPLolGD0ePzicJZEasvlxNE3cnON30=";
   };
 
   nativeBuildInputs = [ cmake ];

From 6d139c50013eb5d1ada1dd3582508f002b6f88ed Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Mon, 29 Sep 2025 20:54:54 +0200
Subject: [PATCH 32/44] alps cthyb new version

---
 alpsPackages/ct-hyb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alpsPackages/ct-hyb/default.nix b/alpsPackages/ct-hyb/default.nix
index 41e4097..b469a9d 100644
--- a/alpsPackages/ct-hyb/default.nix
+++ b/alpsPackages/ct-hyb/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "CT-HYB";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "ALPSCore";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-9WM7ki99YwuaWydKklTpNFD1SEh8j8LOZ0hZ1gkplO4=";
+    sha256 = "sha256-hciV8gfCQwQE2k+7FGnUnUV3cO4jeCvOaeeKXymwAqU=";
   };
 
   nativeBuildInputs = [ cmake ];

From 15b26e4f14deadc58b0aa1cef24ea97a297a0e6c Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Tue, 30 Sep 2025 16:00:50 +0200
Subject: [PATCH 33/44] use cpp14 for testing

---
 pomerolPackages/gftools/default.nix    |  5 +++--
 pomerolPackages/gftools/useCpp14.patch | 11 +++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 pomerolPackages/gftools/useCpp14.patch

diff --git a/pomerolPackages/gftools/default.nix b/pomerolPackages/gftools/default.nix
index e766947..0aac587 100644
--- a/pomerolPackages/gftools/default.nix
+++ b/pomerolPackages/gftools/default.nix
@@ -19,11 +19,12 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-miaG9vw1w+7w1+MMl1f/Yn/0B1IUt6CPWww3BeDNrLA=";
   };
 
+  patches = [ ./useCpp14.patch ];
   nativeBuildInputs = [ cmake gtest ];
-  cmakeFlags = [ "-DTesting=OFF" "-DExamples=ON" ];
+  cmakeFlags = [ "-DTesting=ON" "-DExamples=ON" ];
   buildInputs = [ boost eigen ];
 
-  doCheck = false;
+  doCheck = true;
 
   meta = {
     description = "gftools is a set of tools to work with numerical condmat problems";
diff --git a/pomerolPackages/gftools/useCpp14.patch b/pomerolPackages/gftools/useCpp14.patch
new file mode 100644
index 0000000..7f32452
--- /dev/null
+++ b/pomerolPackages/gftools/useCpp14.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,7 +5,7 @@ cmake_minimum_required (VERSION 3.1)
+ # gftools use only CXX compiler
+ project (GFTools CXX)
+ 
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 14)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+ 

From b936d72473b4fc93410e8e1952d4061205e8aeb8 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Tue, 30 Sep 2025 16:09:17 +0200
Subject: [PATCH 34/44] proper openmpi oversubscribe

---
 pomerolPackages/pomerol/default.nix   |  6 +-----
 pomerolPackages/pomerol/mpitest.patch | 13 -------------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 pomerolPackages/pomerol/mpitest.patch

diff --git a/pomerolPackages/pomerol/default.nix b/pomerolPackages/pomerol/default.nix
index 06a9c46..fdfbc07 100644
--- a/pomerolPackages/pomerol/default.nix
+++ b/pomerolPackages/pomerol/default.nix
@@ -22,10 +22,6 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-s65GSNZcV2virhc6WquhhdNs7YojendQSDHQycSsi7I=";
   };
 
-  # The tests will fail, if it is impossible to spawn 16 mpi processes
-  # this patch will limit it to a reasonable 4
-  patches = [ ./mpitest.patch ];
-
   nativeBuildInputs = [ cmake gtest ];
   cmakeFlags = [
     "-DTesting=ON"
@@ -41,7 +37,7 @@ stdenv.mkDerivation rec {
     mpi
   ];
 
-  OMPI_MCA_rmaps_base_oversubscribe = "yes";
+  PRTE_MCA_rmaps_default_mapping_policy=":oversubscribe";
   checkInputs = [ openssh ];
   doCheck = true;
 
diff --git a/pomerolPackages/pomerol/mpitest.patch b/pomerolPackages/pomerol/mpitest.patch
deleted file mode 100644
index d06dbb5..0000000
--- a/pomerolPackages/pomerol/mpitest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index f69cb10b..c6e4f620 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -51,7 +51,7 @@ foreach(test ${mpi_tests})
-     target_link_libraries(${test} PRIVATE
-                           ${PROJECT_NAME} ${MPI_CXX_LIBRARIES} catch2-pomerol)
- 
--    foreach(np 2 4 8 16)
-+    foreach(np 2 4)
-         set(test_parameters
-             ${MPIEXEC_NUMPROC_FLAG} ${np}
-             ${MPIEXEC_PREFLAGS} ${test} ${MPIEXEC_POSTFLAGS})

From 6f466dca1fdddf0c5aecab22ba8880732024b6aa Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Tue, 30 Sep 2025 16:40:45 +0200
Subject: [PATCH 35/44] self as maintainer

---
 triqsPackages/cppdlr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/triqsPackages/cppdlr/default.nix b/triqsPackages/cppdlr/default.nix
index 6cd2329..47c355f 100644
--- a/triqsPackages/cppdlr/default.nix
+++ b/triqsPackages/cppdlr/default.nix
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
     description = "Discrete Lehmann representation of imaginary time Green's functions";
     homepage = "https://github.com/flatironinstitute/cppdlr";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ hmenke ];
+    maintainers = with lib.maintainers; [ pfadler ];
   };
 }

From 64781698017c59478601c71e3c40e4030fcfff93 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Tue, 30 Sep 2025 16:42:39 +0200
Subject: [PATCH 36/44] cppdlr implicit dependency propagation

---
 triqsPackages/cppdlr/default.nix |  8 +++-----
 triqsPackages/nda/default.nix    | 12 ++++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/triqsPackages/cppdlr/default.nix b/triqsPackages/cppdlr/default.nix
index 47c355f..8299f4c 100644
--- a/triqsPackages/cppdlr/default.nix
+++ b/triqsPackages/cppdlr/default.nix
@@ -9,7 +9,6 @@
 , openblasCompat
 , hdf5
 , mpi
-, git
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./cppdlr.patch ];
   cmakeFlags = [ "-DBuild_Deps=Never" ];
-  nativeBuildInputs = [ cmake gtest git ];
+  nativeBuildInputs = [ cmake gtest ];
   buildInputs = [
     hdf5
     mpi
@@ -34,13 +33,12 @@ stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    triqsPackages.cpp2py
     triqsPackages.h5
     triqsPackages.nda
-    triqsPackages.itertools
-    triqsPackages.mpi
   ];
 
+  doCheck = true;
+
   meta = {
     description = "Discrete Lehmann representation of imaginary time Green's functions";
     homepage = "https://github.com/flatironinstitute/cppdlr";
diff --git a/triqsPackages/nda/default.nix b/triqsPackages/nda/default.nix
index 17bd171..4e3c8f4 100644
--- a/triqsPackages/nda/default.nix
+++ b/triqsPackages/nda/default.nix
@@ -25,14 +25,18 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DBuild_Deps=Never" "-DPythonSupport=ON" ];
   nativeBuildInputs = [ cmake gtest ];
   buildInputs = [
-    triqsPackages.cpp2py
-    triqsPackages.itertools
     triqsPackages.h5
-    triqsPackages.mpi
     openblasCompat
     ncurses
   ];
-  propagatedBuildInputs = with python3Packages; [ numpy mako scipy ];
+  propagatedBuildInputs = [
+    python3Packages.numpy
+    python3Packages.mako
+    python3Packages.scipy
+    triqsPackages.itertools
+    triqsPackages.cpp2py
+    triqsPackages.mpi
+  ];
 
   checkInputs = [ openssh ];
   doCheck = true;

From 2b9665052b2ed2fadec3d85ea460c4fe31b7d14e Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Tue, 30 Sep 2025 16:51:07 +0200
Subject: [PATCH 37/44] already propagated

---
 triqsPackages/h5/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/triqsPackages/h5/default.nix b/triqsPackages/h5/default.nix
index dc85a30..c5141f5 100644
--- a/triqsPackages/h5/default.nix
+++ b/triqsPackages/h5/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DBuild_Deps=Never" ];
   nativeBuildInputs = [ cmake gtest ];
   buildInputs = [ triqsPackages.cpp2py hdf5 ncurses ];
-  propagatedBuildInputs = with python3Packages; [ numpy scipy mako];
+  propagatedBuildInputs = with python3Packages; [ numpy ];
 
   doCheck = true;
 

From 5776229a72f81f11d6c749b2d1eddc2398745c86 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Tue, 30 Sep 2025 16:51:33 +0200
Subject: [PATCH 38/44] consistent capitalization

---
 triqsPackages/cpp2py/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/triqsPackages/cpp2py/default.nix b/triqsPackages/cpp2py/default.nix
index 3b4be22..0c105f2 100644
--- a/triqsPackages/cpp2py/default.nix
+++ b/triqsPackages/cpp2py/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake python3Packages.wrapPython ];
   buildInputs = [ python3 ];
-  pythonPath = with python3Packages; [ h5py Mako numpy scipy ];
+  pythonPath = with python3Packages; [ h5py mako numpy scipy ];
   propagatedBuildInputs = pythonPath;
   postFixup = "wrapPythonPrograms";
 

From d437d8c10916e4b166899ed73af75fa1b4fdf68a Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Tue, 30 Sep 2025 17:07:50 +0200
Subject: [PATCH 39/44] remove superfluous buildinput

---
 triqsPackages/maxent/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/triqsPackages/maxent/default.nix b/triqsPackages/maxent/default.nix
index 0810f84..15d9707 100644
--- a/triqsPackages/maxent/default.nix
+++ b/triqsPackages/maxent/default.nix
@@ -5,7 +5,6 @@
 , triqsPackages
 , python3Packages
 , openssh
-, boost
 }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +19,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake python3Packages.wrapPython ];
-  buildInputs = [ boost ];
   pythonPath = [ python3Packages.decorator ];
   propagatedBuildInputs = pythonPath ++ [ triqsPackages.triqs ];
 

From 8cb11e872b6c531c04defd8f3d0ea1860b51e22b Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Tue, 30 Sep 2025 17:10:59 +0200
Subject: [PATCH 40/44] remove comment and empty list

---
 triqsPackages/tprf/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/triqsPackages/tprf/default.nix b/triqsPackages/tprf/default.nix
index ac9474e..51c3cee 100644
--- a/triqsPackages/tprf/default.nix
+++ b/triqsPackages/tprf/default.nix
@@ -22,9 +22,6 @@ stdenv.mkDerivation rec {
   patches = [ ./tprf.patch ];
   nativeBuildInputs = [ cmake gtest ];
   cmakeFlags = [ "-DBuild_Deps=Never" ];
-  # Documentation specifies 'a working triqs installation,
-  # such that we moved the buildinputs were moved to triqs propagatedBuildInputs'
-  buildInputs = [  ];
   propagatedBuildInputs = [ triqsPackages.triqs ];
 
   checkInputs = [ openssh ];

From b50b8515809b5b1d4d2e622100ed5adceee7b20c Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Tue, 30 Sep 2025 17:25:13 +0200
Subject: [PATCH 41/44] unnecessary buildinputs

---
 triqsPackages/triqs/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/triqsPackages/triqs/default.nix b/triqsPackages/triqs/default.nix
index 717ed0c..c6fb606 100644
--- a/triqsPackages/triqs/default.nix
+++ b/triqsPackages/triqs/default.nix
@@ -1,8 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
-, gcc13
 , cmake
 , gtest
 , fmt
@@ -11,10 +9,8 @@
 , triqsPackages
 , fftw
 , gmp
-, ncurses
 , openblasCompat
 , openssh
-, git
 , hdf5
 }:
 
@@ -32,11 +28,10 @@ stdenv.mkDerivation rec {
   patches = [
     ./triqs.patch
   ];
-  nativeBuildInputs = [ gcc13 cmake gtest fmt python3Packages.wrapPython triqsPackages.itertools ];
+  nativeBuildInputs = [ cmake gtest python3Packages.wrapPython ];
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBuild_Deps=Never" ];
   buildInputs = [
     openblasCompat
-    git
     fmt
   ];
   pythonPath = with python3Packages; [ numpy matplotlib mpi4py Mako scipy ];

From c3ec440a765c3fc20df98e03e95e8fc22b694144 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Tue, 30 Sep 2025 17:51:05 +0200
Subject: [PATCH 42/44] remove strange fftwf dependency

---
 w2dynamics/default.nix        |  6 +++---
 w2dynamics/remove_fftwf.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 w2dynamics/remove_fftwf.patch

diff --git a/w2dynamics/default.nix b/w2dynamics/default.nix
index 51f61fb..61bb4e1 100644
--- a/w2dynamics/default.nix
+++ b/w2dynamics/default.nix
@@ -1,12 +1,10 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , gfortran
 , openblasCompat
 , fftw
-, fftwFloat
 , nfft
 , python3
 , python3Packages
@@ -23,13 +21,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-sBLSui+FFn5js+Ri6kcXcOEv5J/3Z0cXrhGlHdLFLnA=";
   };
 
+  patches = [ ./remove_fftwf.patch ];
+
   nativeBuildInputs = [ cmake python3Packages.wrapPython ];
 
   cmakeFlags = [ "-DUSE_NFFT=1" ];
 
   enableParallelBuilding = false;
 
-  buildInputs = [ gfortran openblasCompat fftw fftwFloat nfft ];
+  buildInputs = [ gfortran openblasCompat fftw nfft ];
 
   pythonPath = with python3Packages; [ numpy scipy h5py mpi4py configobj ];
   propagatedBuildInputs = pythonPath;
diff --git a/w2dynamics/remove_fftwf.patch b/w2dynamics/remove_fftwf.patch
new file mode 100644
index 0000000..d12971a
--- /dev/null
+++ b/w2dynamics/remove_fftwf.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/Modules/FindFFTW.cmake b/cmake/Modules/FindFFTW.cmake
+index 4c4520a..c45e9eb 100644
+--- a/cmake/Modules/FindFFTW.cmake
++++ b/cmake/Modules/FindFFTW.cmake
+@@ -104,7 +104,7 @@ else()
+ 
+ endif( FFTW_ROOT )
+ 
+-set(FFTW_LIBRARIES ${FFTW_LIB} ${FFTWF_LIB})
++set(FFTW_LIBRARIES ${FFTW_LIB})
+ 
+ if(FFTWL_LIB)
+   set(FFTW_LIBRARIES ${FFTW_LIBRARIES} ${FFTWL_LIB})

From d4893ebe90a8bf98fc6050d375325b02f1719894 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Tue, 30 Sep 2025 17:55:32 +0200
Subject: [PATCH 43/44] no propagation of build dependencies

---
 triqsPackages/triqs/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/triqsPackages/triqs/default.nix b/triqsPackages/triqs/default.nix
index c6fb606..a18d780 100644
--- a/triqsPackages/triqs/default.nix
+++ b/triqsPackages/triqs/default.nix
@@ -36,10 +36,6 @@ stdenv.mkDerivation rec {
   ];
   pythonPath = with python3Packages; [ numpy matplotlib mpi4py Mako scipy ];
   propagatedBuildInputs = [
-    hdf5
-    boost
-    fftw
-    gmp
     triqsPackages.cpp2py
     triqsPackages.h5
     triqsPackages.nda

From b56b1e3efcf5d2dcbe8a52b77def0e1dd5c5a323 Mon Sep 17 00:00:00 2001
From: Paul Fadler <paul.fadler@fau.de>
Date: Tue, 30 Sep 2025 18:40:12 +0200
Subject: [PATCH 44/44] move instead of remove inputs

---
 triqsPackages/triqs/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/triqsPackages/triqs/default.nix b/triqsPackages/triqs/default.nix
index a18d780..f87c4e9 100644
--- a/triqsPackages/triqs/default.nix
+++ b/triqsPackages/triqs/default.nix
@@ -33,6 +33,10 @@ stdenv.mkDerivation rec {
   buildInputs = [
     openblasCompat
     fmt
+    hdf5
+    boost
+    fftw
+    gmp
   ];
   pythonPath = with python3Packages; [ numpy matplotlib mpi4py Mako scipy ];
   propagatedBuildInputs = [