Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion doc/manual/source/installation/prerequisites-source.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- Bash Shell. The `./configure` script relies on bashisms, so Bash is
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
provide it, you can get it from
Expand Down
4 changes: 2 additions & 2 deletions nix-meson-build-support/export/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ extra_pkg_config_variables = get_variable('extra_pkg_config_variables', {})

extra_cflags = []
if not meson.project_name().endswith('-c')
extra_cflags += [ '-std=c++2a' ]
extra_cflags += [ '-std=c++23' ]
endif

import('pkgconfig').generate(
Expand All @@ -34,7 +34,7 @@ meson.override_dependency(
declare_dependency(
include_directories : include_dirs,
link_with : this_library,
compile_args : [ '-std=c++2a' ],
compile_args : [ '-std=c++23' ],
dependencies : deps_public_subproject + deps_public,
variables : extra_pkg_config_variables,
),
Expand Down
2 changes: 1 addition & 1 deletion src/libcmd/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libexpr-c/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libexpr-test-support/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
1 change: 1 addition & 0 deletions src/libexpr-test-support/tests/value/context.cc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <exception> // Needed by rapidcheck on Darwin
#include <rapidcheck.h>

#include "nix/store/tests/path.hh"
Expand Down
1 change: 1 addition & 0 deletions src/libexpr-tests/derived-path.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <nlohmann/json.hpp>
#include <gtest/gtest.h>
#include <exception> // Needed by rapidcheck on Darwin
#include <rapidcheck/gtest.h>

#include "nix/store/tests/derived-path.hh"
Expand Down
2 changes: 1 addition & 1 deletion src/libexpr-tests/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libexpr/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libfetchers-c/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libfetchers-tests/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libfetchers/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libflake-c/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libflake-tests/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libflake/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libmain-c/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libmain/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libstore-c/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
1 change: 1 addition & 0 deletions src/libstore-test-support/derived-path.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <regex>

#include <exception> // Needed by rapidcheck on Darwin
#include <rapidcheck.h>

#include "nix/store/tests/derived-path.hh"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once
///@file

#include <exception> // Needed by rapidcheck on Darwin
#include <rapidcheck/gen/Arbitrary.h>

#include "nix/store/outputs-spec.hh"
Expand Down
2 changes: 1 addition & 1 deletion src/libstore-test-support/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
3 changes: 2 additions & 1 deletion src/libstore-test-support/path.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <rapidcheck/gen/Arbitrary.h>
#include <exception> // Needed by rapidcheck on Darwin
#include <regex>

#include <rapidcheck/gen/Arbitrary.h>
#include <rapidcheck.h>

#include "nix/store/path-regex.hh"
Expand Down
2 changes: 1 addition & 1 deletion src/libstore-tests/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libstore/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libutil-c/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
1 change: 1 addition & 0 deletions src/libutil-test-support/hash.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <regex>

#include <exception> // Needed by rapidcheck on Darwin
#include <rapidcheck.h>

#include "nix/util/hash.hh"
Expand Down
2 changes: 1 addition & 1 deletion src/libutil-test-support/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libutil-tests/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/libutil/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion src/nix/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(
'cpp',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ project(
'nix-functional-tests',
version : files('.version'),
default_options : [
'cpp_std=c++2a',
'cpp_std=c++23',
# TODO(Qyriad): increase the warning level
'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail
Expand Down
Loading