Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
84a0ba6
New triqs version
Mar 24, 2025
126b1ad
mpi version increase
Mar 24, 2025
e405c5a
update patch
Mar 24, 2025
5074828
gtest dependency
Mar 24, 2025
6ea9ec6
first set of patches fixed, ld broken
Mar 24, 2025
f377924
new version cpp2py
Aug 6, 2025
3d6c7cc
new dependencies
Aug 6, 2025
434d487
new version and updated patches
Aug 6, 2025
8eb6818
add cppdlr
Aug 6, 2025
f3cc421
missing include for cppdlr
Aug 6, 2025
ec579ef
correct dependency for triqs 3.3 release
Aug 8, 2025
745ba25
Add python support for triqs tests
Aug 8, 2025
2efd0ee
new dependencies for 3.3
Aug 8, 2025
c1fc95b
version bump
Aug 8, 2025
ab4490f
bump flake
Aug 8, 2025
71db52a
fmt search for triqs
Aug 8, 2025
76b8ba4
update cthyb for 3.3
Aug 8, 2025
4b2bdae
changes for 3.3.1
Aug 8, 2025
c43bd80
maxent -> 3.3.0
Aug 8, 2025
e707000
pyed new release
Aug 11, 2025
42a0dfa
new version for omegamaxent interface
Aug 11, 2025
99e553b
added dependency necessary for import wo triqs
Aug 23, 2025
f800da8
moved tprf buildinputs to triqs propagated
Aug 25, 2025
90f08ad
tprf needs hdf5
Aug 25, 2025
00828c0
amend sha of cppdlr
pfadler Sep 22, 2025
190851e
New version necessitates fftwf
Sep 28, 2025
28054d7
some issues with gtest and cpp11
Sep 28, 2025
65ba207
new version
Sep 28, 2025
f536b17
new pomerol version
Sep 28, 2025
4c0bb34
new interface version
Sep 28, 2025
e07dd7d
new alps version
Sep 29, 2025
6d139c5
alps cthyb new version
Sep 29, 2025
15b26e4
use cpp14 for testing
Sep 30, 2025
b936d72
proper openmpi oversubscribe
Sep 30, 2025
6f466dc
self as maintainer
Sep 30, 2025
6478169
cppdlr implicit dependency propagation
Sep 30, 2025
2b96650
already propagated
Sep 30, 2025
5776229
consistent capitalization
Sep 30, 2025
d437d8c
remove superfluous buildinput
Sep 30, 2025
8cb11e8
remove comment and empty list
Sep 30, 2025
b50b851
unnecessary buildinputs
Sep 30, 2025
c3ec440
remove strange fftwf dependency
Sep 30, 2025
d4893eb
no propagation of build dependencies
Sep 30, 2025
b56b1e3
move instead of remove inputs
Sep 30, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions alpsPackages/alpsCore/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
4 changes: 2 additions & 2 deletions alpsPackages/ct-hyb/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
34 changes: 25 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions nfft/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions pomerolPackages/gftools/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand All @@ -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 ];
};
Expand Down
11 changes: 11 additions & 0 deletions pomerolPackages/gftools/useCpp14.patch
Original file line number Diff line number Diff line change
@@ -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)

21 changes: 2 additions & 19 deletions pomerolPackages/libcommute/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];

Expand Down
22 changes: 5 additions & 17 deletions pomerolPackages/pomerol/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 ];
};
Expand Down
8 changes: 4 additions & 4 deletions pomerolPackages/pomerol2triqs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand All @@ -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 ];
};
Expand Down
8 changes: 4 additions & 4 deletions triqsPackages/cpp2py/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
46 changes: 46 additions & 0 deletions triqsPackages/cppdlr/cppdlr.patch
Original file line number Diff line number Diff line change
@@ -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
48 changes: 48 additions & 0 deletions triqsPackages/cppdlr/default.nix
Original file line number Diff line number Diff line change
@@ -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
];
Comment on lines +35 to +38

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does cppdlr really depend on all of these? As far as I can see it only depends on nda and h5.

Suggested change
propagatedBuildInputs = [
triqsPackages.cpp2py
triqsPackages.h5
triqsPackages.nda
triqsPackages.itertools
triqsPackages.mpi
];
propagatedBuildInputs = [
triqsPackages.h5
triqsPackages.nda
];

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think i wrongly interpreted the error message of a failing build of cppdlr complaining about some missing dependencies. That might however be due to these being dependencies of the dependencies that are not properly propagated. I will have a look into that

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the installation of cppdlr automatically installs nda and therefore expects its dependencies (itertools, cpp2py and mpi) to be available. I have moved them from buildInputs to propagatedBuildInputs in the nda package or are they rather suited for propagatedNativeBuildInputs?


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 ];
};
}
6 changes: 3 additions & 3 deletions triqsPackages/cthyb/cthyb.patch
Original file line number Diff line number Diff line change
@@ -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
)
Expand Down
Loading