Skip to content

chore: TOML 4.4 Issues #2576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trisyoungs merged 6 commits into from
Aug 10, 2026
Merged

chore: TOML 4.4 Issues #2576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
94955c3
Headers.
trisyoungs Aug 10, 2026
2304a41
ostream vs TOML.
trisyoungs Aug 10, 2026
6d6f60f
Simplify toml imports
rprospero Aug 10, 2026
ff72c0a
Stop vendoring toml11 in Nix
rprospero Aug 10, 2026
d0d46c2
Remove as_string calls
rprospero Aug 10, 2026
0c989d7
Finish removing vendored onedpl
rprospero Aug 10, 2026
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
18 changes: 3 additions & 15 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,6 @@
}:
let

toml = pkgs: ((import ./nix/toml11.nix) { inherit pkgs; });
onedpl = pkgs: old: pkgs.onedpl;
# ((import ./nix/onedpl.nix) {
# inherit (pkgs)
# lib
# stdenv
# fetchFromGitHub
# fetchpatch
# cmake
# ;
# tbb = old.tbb_2021_11;
# });
exe-name = gui: if gui then "dissolve-gui" else "dissolve";
cmake-bool = x: if x then "ON" else "OFF";
version = "1.9.0";
Expand All @@ -52,7 +40,7 @@
jre
pkg-config
pugixml
(toml pkgs)
toml11
];
gui_libs = system: pkgs: qt: [
pkgs.glib
Expand Down Expand Up @@ -113,7 +101,7 @@
++ pkgs.lib.optionals checks (check_libs pkgs)
++ pkgs.lib.optionals threading [
old.tbb_2021_11
(onedpl pkgs old)
pkgs.onedpl
];
nativeBuildInputs = pkgs.lib.optionals gui [ pkgs.wrapGAppsHook3 ];

Expand Down Expand Up @@ -186,7 +174,7 @@
++ (with pkgs; [
llvmPackages_20.clang-tools

(onedpl pkgs old)
onedpl

ccache
ccls
Expand Down
63 changes: 0 additions & 63 deletions nix/onedpl.nix
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions nix/toml11.nix
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions src/base/serialiser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
#pragma once

#include "templates/orderedMap.h"
#include <toml11/toml.hpp>
#include <toml11/toml11/error_info.hpp>
#include <toml11/toml11/parser.hpp>
#include <toml11/toml11/result.hpp>
#include <toml11/toml11/source_location.hpp>
#include <toml.hpp>
#include <vector>

struct wo_comment_config
Expand Down
1 change: 0 additions & 1 deletion src/nodes/forcefield.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include "nodes/forcefield.h"
#include "data/ff/library.h"
#include <toml11/toml.hpp>

ForcefieldNode::ForcefieldNode(Graph *parentGraph) : Node(parentGraph)
{
Expand Down
1 change: 0 additions & 1 deletion tests/algorithms/orderedMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "templates/orderedMap.h"
#include "base/serialiser.h"
#include <gtest/gtest.h>
#include <toml11/toml.hpp>

namespace UnitTest
{
Expand Down
Loading