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 ];
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 ];
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",
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
diff --git a/pomerolPackages/gftools/default.nix b/pomerolPackages/gftools/default.nix
index 79b009e..0aac587 100644
--- a/pomerolPackages/gftools/default.nix
+++ b/pomerolPackages/gftools/default.nix
@@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
   version = "2022.03";
 
   src = fetchFromGitHub {
-    owner = "aeantipov";
+    owner = "pomerol-ed";
     repo = pname;
     rev = version;
     sha256 = "sha256-miaG9vw1w+7w1+MMl1f/Yn/0B1IUt6CPWww3BeDNrLA=";
   };
 
+  patches = [ ./useCpp14.patch ];
   nativeBuildInputs = [ cmake gtest ];
   cmakeFlags = [ "-DTesting=ON" "-DExamples=ON" ];
   buildInputs = [ boost eigen ];
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
 
   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 ];
   };
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)
+ 
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 ];
 
diff --git a/pomerolPackages/pomerol/default.nix b/pomerolPackages/pomerol/default.nix
index 0fe78c3..fdfbc07 100644
--- a/pomerolPackages/pomerol/default.nix
+++ b/pomerolPackages/pomerol/default.nix
@@ -13,27 +13,15 @@
 
 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=";
-    })
-  ];
   nativeBuildInputs = [ cmake gtest ];
   cmakeFlags = [
     "-DTesting=ON"
@@ -49,13 +37,13 @@ stdenv.mkDerivation rec {
     mpi
   ];
 
-  OMPI_MCA_rmaps_base_oversubscribe = "yes";
+  PRTE_MCA_rmaps_default_mapping_policy=":oversubscribe";
   checkInputs = [ openssh ];
   doCheck = true;
 
   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/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 ];
   };
diff --git a/triqsPackages/cpp2py/default.nix b/triqsPackages/cpp2py/default.nix
index b184b4e..0c105f2 100644
--- a/triqsPackages/cpp2py/default.nix
+++ b/triqsPackages/cpp2py/default.nix
@@ -7,22 +7,22 @@
 }:
 
 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 ];
   buildInputs = [ python3 ];
-  pythonPath = with python3Packages; [ h5py Mako numpy scipy ];
+  pythonPath = with python3Packages; [ h5py mako numpy scipy ];
   propagatedBuildInputs = pythonPath;
   postFixup = "wrapPythonPrograms";
 
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..8299f4c
--- /dev/null
+++ b/triqsPackages/cppdlr/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, gtest
+, triqsPackages
+, fmt
+, python3Packages
+, openblasCompat
+, hdf5
+, mpi
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cppdlr";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "flatironinstitute";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-PxZtJifJotQtON+bEVGelXl/G9jxxfV5WmD6UJlhtLU=";
+  };
+
+  patches = [ ./cppdlr.patch ];
+  cmakeFlags = [ "-DBuild_Deps=Never" ];
+  nativeBuildInputs = [ cmake gtest ];
+  buildInputs = [
+    hdf5
+    mpi
+    openblasCompat
+    fmt
+  ];
+
+  propagatedBuildInputs = [
+    triqsPackages.h5
+    triqsPackages.nda
+  ];
+
+  doCheck = true;
+
+  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; [ pfadler ];
+  };
+}
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 ];
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 { };
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..9dc34dc 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,9 +26,9 @@ 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
 --- a/test/c++/CMakeLists.txt
@@ -42,15 +42,3 @@ index 59fca85..868a229 100644
    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()
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/maxent/default.nix b/triqsPackages/maxent/default.nix
index 1430555..15d9707 100644
--- a/triqsPackages/maxent/default.nix
+++ b/triqsPackages/maxent/default.nix
@@ -9,13 +9,13 @@
 
 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 ];
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 ];
diff --git a/triqsPackages/mpi/mpi.patch b/triqsPackages/mpi/mpi.patch
index c833809..26061f1 100644
--- a/triqsPackages/mpi/mpi.patch
+++ b/triqsPackages/mpi/mpi.patch
@@ -1,16 +1,8 @@
 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
-@@ -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
@@ -19,7 +11,7 @@ index ca0b79a..e888d57 100644
  )
  
 diff --git a/test/c++/CMakeLists.txt b/test/c++/CMakeLists.txt
-index a5e32a8..940b75d 100644
+index be60f50..ccbd850 100644
 --- a/test/c++/CMakeLists.txt
 +++ b/test/c++/CMakeLists.txt
 @@ -25,7 +25,7 @@ foreach(test ${all_tests})
@@ -27,7 +19,8 @@ index a5e32a8..940b75d 100644
    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)
++  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} 4 ${MPIEXEC_PREFLAGS} ${test_bin} ${MPIEXEC_POSTFLAGS} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
+   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})
+ 
diff --git a/triqsPackages/nda/default.nix b/triqsPackages/nda/default.nix
index 9a04611..4e3c8f4 100644
--- a/triqsPackages/nda/default.nix
+++ b/triqsPackages/nda/default.nix
@@ -12,27 +12,31 @@
 
 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 ];
-  cmakeFlags = [ "-DBuild_Deps=Never" ];
+  cmakeFlags = [ "-DBuild_Deps=Never" "-DPythonSupport=ON" ];
   nativeBuildInputs = [ cmake gtest ];
   buildInputs = [
-    triqsPackages.cpp2py
-    triqsPackages.itertools
     triqsPackages.h5
-    triqsPackages.mpi
     openblasCompat
     ncurses
   ];
-  propagatedBuildInputs = with python3Packages; [ numpy ];
+  propagatedBuildInputs = [
+    python3Packages.numpy
+    python3Packages.mako
+    python3Packages.scipy
+    triqsPackages.itertools
+    triqsPackages.cpp2py
+    triqsPackages.mpi
+  ];
 
   checkInputs = [ openssh ];
   doCheck = true;
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})
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
- 
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
diff --git a/triqsPackages/tprf/default.nix b/triqsPackages/tprf/default.nix
index 8b70064..51c3cee 100644
--- a/triqsPackages/tprf/default.nix
+++ b/triqsPackages/tprf/default.nix
@@ -5,25 +5,23 @@
 , cmake
 , gtest
 , triqsPackages
-, ncurses
 , openssh
 }:
 
 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 ];
   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
    )
diff --git a/triqsPackages/triqs/default.nix b/triqsPackages/triqs/default.nix
index 859d76c..f87c4e9 100644
--- a/triqsPackages/triqs/default.nix
+++ b/triqsPackages/triqs/default.nix
@@ -1,51 +1,42 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , gtest
+, fmt
 , python3Packages
 , boost
 , triqsPackages
 , fftw
 , gmp
-, ncurses
 , openblasCompat
 , openssh
+, hdf5
 }:
 
 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 ];
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBuild_Deps=Never" ];
   buildInputs = [
+    openblasCompat
+    fmt
+    hdf5
     boost
     fftw
     gmp
-    ncurses
-    openblasCompat
   ];
   pythonPath = with python3Packages; [ numpy matplotlib mpi4py Mako scipy ];
   propagatedBuildInputs = [
@@ -54,6 +45,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 7d620b0..d26553b 100644
--- a/triqsPackages/triqs/triqs.patch
+++ b/triqsPackages/triqs/triqs.patch
@@ -1,43 +1,18 @@
-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/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 cb56367..187f209 100644
+index f1ef146d..1e9cad94 100644
 --- a/deps/CMakeLists.txt
 +++ b/deps/CMakeLists.txt
 @@ -64,7 +64,6 @@ endif()
@@ -48,16 +23,22 @@ index cb56367..187f209 100644
    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})
- 
+@@ -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
diff --git a/w2dynamics/default.nix b/w2dynamics/default.nix
index 01c54d1..61bb4e1 100644
--- a/w2dynamics/default.nix
+++ b/w2dynamics/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , gfortran
 , openblasCompat
@@ -13,22 +12,16 @@
 
 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=";
-    })
-  ];
+  patches = [ ./remove_fftwf.patch ];
 
   nativeBuildInputs = [ cmake python3Packages.wrapPython ];
 
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})