nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 03:56:01 +01:00
Code Activity

Merge pull request #13793 from xokdvium/c++23

Browse source 
treewide: Bump C++ standard version to C++23
This commit is contained in:
John Ericson 2025-08-19 12:37:17 -04:00 • committed by GitHub
commit a92a996dba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
31 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/source/installation/prerequisites-source.md
View file

@ -10,7 +10,7 @@
- Bash Shell. The `./configure` script relies on bashisms, so Bash is - Bash Shell. The `./configure` script relies on bashisms, so Bash is
required. required.
- A version of GCC or Clang that supports C++20. - A version of GCC or Clang that supports C++23.
- `pkg-config` to locate dependencies. If your distribution does not - `pkg-config` to locate dependencies. If your distribution does not
provide it, you can get it from provide it, you can get it from

4
nix-meson-build-support/export/meson.build
View file

@ -14,7 +14,7 @@ extra_pkg_config_variables = get_variable('extra_pkg_config_variables', {})
extra_cflags = [] extra_cflags = []
if not meson.project_name().endswith('-c') if not meson.project_name().endswith('-c')
extra_cflags += [ '-std=c++2a' ] extra_cflags += [ '-std=c++23' ]
endif endif
import('pkgconfig').generate( import('pkgconfig').generate(
@ -34,7 +34,7 @@ meson.override_dependency(
declare_dependency( declare_dependency(
include_directories : include_dirs, include_directories : include_dirs,
link_with : this_library, link_with : this_library,
compile_args : [ '-std=c++2a' ], compile_args : [ '-std=c++23' ],
dependencies : deps_public_subproject + deps_public, dependencies : deps_public_subproject + deps_public,
variables : extra_pkg_config_variables, variables : extra_pkg_config_variables,
), ),

2
src/libcmd/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libexpr-c/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libexpr-test-support/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

1
src/libexpr-test-support/tests/value/context.cc
View file

@ -1,3 +1,4 @@
#include <exception> // Needed by rapidcheck on Darwin
#include <rapidcheck.h> #include <rapidcheck.h>
#include "nix/store/tests/path.hh" #include "nix/store/tests/path.hh"

1
src/libexpr-tests/derived-path.cc
View file

@ -1,5 +1,6 @@
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <exception> // Needed by rapidcheck on Darwin
#include <rapidcheck/gtest.h> #include <rapidcheck/gtest.h>
#include "nix/store/tests/derived-path.hh" #include "nix/store/tests/derived-path.hh"

2
src/libexpr-tests/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libexpr/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libfetchers-c/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libfetchers-tests/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libfetchers/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libflake-c/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libflake-tests/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libflake/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libmain-c/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libmain/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libstore-c/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

1
src/libstore-test-support/derived-path.cc
View file

@ -1,5 +1,6 @@
#include <regex> #include <regex>
#include <exception> // Needed by rapidcheck on Darwin
#include <rapidcheck.h> #include <rapidcheck.h>
#include "nix/store/tests/derived-path.hh" #include "nix/store/tests/derived-path.hh"

1
src/libstore-test-support/include/nix/store/tests/outputs-spec.hh
View file

@ -1,6 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include <exception> // Needed by rapidcheck on Darwin
#include <rapidcheck/gen/Arbitrary.h> #include <rapidcheck/gen/Arbitrary.h>
#include "nix/store/outputs-spec.hh" #include "nix/store/outputs-spec.hh"

2
src/libstore-test-support/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

3
src/libstore-test-support/path.cc
View file

@ -1,6 +1,7 @@
#include <rapidcheck/gen/Arbitrary.h> #include <exception> // Needed by rapidcheck on Darwin
#include <regex> #include <regex>
#include <rapidcheck/gen/Arbitrary.h>
#include <rapidcheck.h> #include <rapidcheck.h>
#include "nix/store/path-regex.hh" #include "nix/store/path-regex.hh"

2
src/libstore-tests/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libstore/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libutil-c/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

1
src/libutil-test-support/hash.cc
View file

@ -1,5 +1,6 @@
#include <regex> #include <regex>
#include <exception> // Needed by rapidcheck on Darwin
#include <rapidcheck.h> #include <rapidcheck.h>
#include "nix/util/hash.hh" #include "nix/util/hash.hh"

2
src/libutil-test-support/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libutil-tests/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/libutil/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
src/nix/meson.build
View file

@ -3,7 +3,7 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail

2
tests/functional/meson.build
View file

@ -2,7 +2,7 @@ project(
'nix-functional-tests', 'nix-functional-tests',
version : files('.version'), version : files('.version'),
default_options : [ default_options : [
'cpp_std=c++2a', 'cpp_std=c++23',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail