Merge remote-tracking branch 'origin/master' into lazy-trees

.clang-format

@@ -0,0 +1,30 @@
+BasedOnStyle: LLVM
+IndentWidth: 4
+BreakBeforeBraces: Custom
+BraceWrapping:
+ AfterStruct: true
+ AfterClass: true
+ AfterFunction: true
+ AfterUnion: true
+ SplitEmptyRecord: false
+PointerAlignment: Middle
+FixNamespaceComments: false
+SortIncludes: Never
+#IndentPPDirectives: BeforeHash
+SpaceAfterCStyleCast: true
+SpaceAfterTemplateKeyword: false
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+AlignEscapedNewlines: DontAlign
+ColumnLimit: 120
+BreakStringLiterals: false
+BitFieldColonSpacing: None
+AllowShortFunctionsOnASingleLine: Empty
+AlwaysBreakTemplateDeclarations: Yes
+BinPackParameters: false
+BreakConstructorInitializers: BeforeComma
+EmptyLineAfterAccessModifier: Leave # change to always/never later?
+EmptyLineBeforeAccessModifier: Leave
+#PackConstructorInitializers: BinPack
+BreakBeforeBinaryOperators: NonAssignment
+AlwaysBreakBeforeMultilineStrings: true

.clang-tidy

@@ -0,0 +1,3 @@
+# We use pointers to aggregates in a couple of places, intentionally.
+# void * would look weird.
+Checks: '-bugprone-sizeof-expression'

.github/CODEOWNERS

@@ -10,16 +10,8 @@
 # This file
 .github/CODEOWNERS @edolstra
 
-# Public documentation
-/doc @fricklerhandwerk
-*.md @fricklerhandwerk
-
 # Documentation of built-in functions
-src/libexpr/primops.cc @fricklerhandwerk @roberth
-# Documentation on experimental features
-src/libutil/experimental-features.cc @fricklerhandwerk
-# Documentation on configuration settings
-src/libstore/globals.hh @fricklerhandwerk
+src/libexpr/primops.cc @roberth
 
 # Libstore layer
 /src/libstore @thufschmitt

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,6 +10,8 @@
 
 <!-- Large change: Provide instructions to reviewers how to read the diff. -->
 
-# Priorities
+# Priorities and Process
 
 Add :+1: to [pull requests you find important](https://github.com/NixOS/nix/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc).
+
+The Nix maintainer team uses a [GitHub project board](https://github.com/orgs/NixOS/projects/19) to [schedule and track reviews](https://github.com/NixOS/nix/tree/master/maintainers#project-board-protocol). 

.github/workflows/backport.yml

@@ -21,7 +21,7 @@ jobs:
  fetch-depth: 0
  - name: Create backport PRs
  # should be kept in sync with `version`
- uses: zeebe-io/backport-action@v2.2.0
+ uses: zeebe-io/backport-action@v2.4.1
  with:
  # Config README: https://github.com/zeebe-io/backport-action#backport-action
  github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -20,12 +20,12 @@ jobs:
  - uses: actions/checkout@v4
  with:
  fetch-depth: 0
- - uses: cachix/install-nix-action@v24
+ - uses: cachix/install-nix-action@v25
  with:
  # The sandbox would otherwise be disabled by default on Darwin
  extra_nix_config: "sandbox = true"
  - run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
- - uses: cachix/cachix-action@v13
+ - uses: cachix/cachix-action@v14
  if: needs.check_secrets.outputs.cachix == 'true'
  with:
  name: '${{ env.CACHIX_NAME }}'
@@ -62,10 +62,10 @@ jobs:
  with:
  fetch-depth: 0
  - run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
- - uses: cachix/install-nix-action@v24
+ - uses: cachix/install-nix-action@v25
  with:
  install_url: https://releases.nixos.org/nix/nix-2.13.3/install
- - uses: cachix/cachix-action@v13
+ - uses: cachix/cachix-action@v14
  with:
  name: '${{ env.CACHIX_NAME }}'
  signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
@@ -84,7 +84,7 @@ jobs:
  steps:
  - uses: actions/checkout@v4
  - run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
- - uses: cachix/install-nix-action@v24
+ - uses: cachix/install-nix-action@v25
  with:
  install_url: '${{needs.installer.outputs.installerURL}}'
  install_options: "--tarball-url-prefix https://${{ env.CACHIX_NAME }}.cachix.org/serve"
@@ -114,12 +114,12 @@ jobs:
  - uses: actions/checkout@v4
  with:
  fetch-depth: 0
- - uses: cachix/install-nix-action@v24
+ - uses: cachix/install-nix-action@v25
  with:
  install_url: https://releases.nixos.org/nix/nix-2.13.3/install
  - run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
  - run: echo NIX_VERSION="$(nix --experimental-features 'nix-command flakes' eval .\#default.version | tr -d \")" >> $GITHUB_ENV
- - uses: cachix/cachix-action@v13
+ - uses: cachix/cachix-action@v14
  if: needs.check_secrets.outputs.cachix == 'true'
  with:
  name: '${{ env.CACHIX_NAME }}'

.gitignore

@@ -94,6 +94,7 @@ perl/Makefile.config
 /tests/functional/ca/config.nix
 /tests/functional/dyn-drv/config.nix
 /tests/functional/repl-result-out
+/tests/functional/debugger-test-out
 /tests/functional/test-libstoreconsumer/test-libstoreconsumer
 
 # /tests/functional/lang/
@@ -141,6 +142,7 @@ compile_commands.json
 nix-rust/target
 
 result
+result-*
 
 # IDE
 .vscode/

.version

@@ -1 +1 @@
-2.20.0
+2.21.0

CONTRIBUTING.md

@@ -63,7 +63,7 @@ Check out the [security policy](https://github.com/NixOS/nix/security/policy).
  - Functional tests – [`tests/functional/**.sh`](./tests/functional)
  - Unit tests – [`src/*/tests`](./src/)
  - Integration tests – [`tests/nixos/*`](./tests/nixos)
- - [ ] User documentation in the [manual](..doc/manual/src)
+ - [ ] User documentation in the [manual](./doc/manual/src)
  - [ ] API documentation in header files
  - [ ] Code and comments are self-explanatory
  - [ ] Commit message explains **why** the change was made

Makefile

@@ -1,8 +1,12 @@
+# External build directory support
+
 include mk/build-dir.mk
 
 -include $(buildprefix)Makefile.config
 clean-files += $(buildprefix)Makefile.config
 
+# List makefiles
+
 ifeq ($(ENABLE_BUILD), yes)
 makefiles = \
  mk/precompiled-headers.mk \
@@ -24,7 +28,7 @@ makefiles = \
  misc/upstart/local.mk
 endif
 
-ifeq ($(ENABLE_BUILD)_$(ENABLE_TESTS), yes_yes)
+ifeq ($(ENABLE_UNIT_TESTS), yes)
 makefiles += \
  tests/unit/libutil/local.mk \
  tests/unit/libutil-support/local.mk \
@@ -34,18 +38,28 @@ makefiles += \
  tests/unit/libexpr-support/local.mk
 endif
 
-ifeq ($(ENABLE_TESTS), yes)
+ifeq ($(ENABLE_FUNCTIONAL_TESTS), yes)
 makefiles += \
  tests/functional/local.mk \
  tests/functional/ca/local.mk \
  tests/functional/dyn-drv/local.mk \
  tests/functional/test-libstoreconsumer/local.mk \
  tests/functional/plugins/local.mk
-else
-makefiles += \
- mk/disable-tests.mk
 endif
 
+# Some makefiles require access to built programs and must be included late.
+makefiles-late =
+
+ifeq ($(ENABLE_DOC_GEN), yes)
+makefiles-late += doc/manual/local.mk
+endif
+
+ifeq ($(ENABLE_INTERNAL_API_DOCS), yes)
+makefiles-late += doc/internal-api/local.mk
+endif
+
+# Miscellaneous global Flags
+
 OPTIMIZE = 1
 
 ifeq ($(OPTIMIZE), 1)
@@ -55,13 +69,55 @@ else
  GLOBAL_CXXFLAGS += -O0 -U_FORTIFY_SOURCE
 endif
 
-include mk/lib.mk
+include mk/platform.mk
 
-# Must be included after `mk/lib.mk` so rules refer to variables defined
-# by the library. Rules are not "lazy" like variables, unfortunately.
-ifeq ($(ENABLE_BUILD), yes)
-$(eval $(call include-sub-makefile, doc/manual/local.mk))
-$(eval $(call include-sub-makefile, doc/internal-api/local.mk))
+ifdef HOST_WINDOWS
+ # Windows DLLs are stricter about symbol visibility than Unix shared
+ # objects --- see https://gcc.gnu.org/wiki/Visibility for details.
+ # This is a temporary sledgehammer to export everything like on Unix,
+ # and not detail with this yet.
+ #
+ # TODO do not do this, and instead do fine-grained export annotations.
+ GLOBAL_LDFLAGS += -Wl,--export-all-symbols
 endif
 
 GLOBAL_CXXFLAGS += -g -Wall -include $(buildprefix)config.h -std=c++2a -I src
+
+# Include the main lib, causing rules to be defined
+
+include mk/lib.mk
+
+# Fallback stub rules for better UX when things are disabled
+#
+# These must be defined after `mk/lib.mk`. Otherwise the first rule
+# incorrectly becomes the default target.
+
+ifneq ($(ENABLE_UNIT_TESTS), yes)
+.PHONY: check
+check:
+ @echo "Unit tests are disabled. Configure without '--disable-unit-tests', or avoid calling 'make check'."
+ @exit 1
+endif
+
+ifneq ($(ENABLE_FUNCTIONAL_TESTS), yes)
+.PHONY: installcheck
+installcheck:
+ @echo "Functional tests are disabled. Configure without '--disable-functional-tests', or avoid calling 'make installcheck'."
+ @exit 1
+endif
+
+# Documentation fallback stub rules.
+
+ifneq ($(ENABLE_DOC_GEN), yes)
+.PHONY: manual-html manpages
+manual-html manpages:
+ @echo "Generated docs are disabled. Configure without '--disable-doc-gen', or avoid calling 'make manpages' and 'make manual-html'."
+ @exit 1
+endif
+
+ifneq ($(ENABLE_INTERNAL_API_DOCS), yes)
+.PHONY: internal-api-html
+internal-api-html:
+ @echo "Internal API docs are disabled. Configure with '--enable-internal-api-docs', or avoid calling 'make internal-api-html'."
+ @exit 1
+endif

Makefile.config.in

@@ -9,8 +9,11 @@ CXXFLAGS = @CXXFLAGS@
 CXXLTO = @CXXLTO@
 EDITLINE_LIBS = @EDITLINE_LIBS@
 ENABLE_BUILD = @ENABLE_BUILD@
+ENABLE_DOC_GEN = @ENABLE_DOC_GEN@
+ENABLE_FUNCTIONAL_TESTS = @ENABLE_FUNCTIONAL_TESTS@
+ENABLE_INTERNAL_API_DOCS = @ENABLE_INTERNAL_API_DOCS@
 ENABLE_S3 = @ENABLE_S3@
-ENABLE_TESTS = @ENABLE_TESTS@
+ENABLE_UNIT_TESTS = @ENABLE_UNIT_TESTS@
 GTEST_LIBS = @GTEST_LIBS@
 HAVE_LIBCPUID = @HAVE_LIBCPUID@
 HAVE_SECCOMP = @HAVE_SECCOMP@
@@ -26,7 +29,6 @@ LOWDOWN_LIBS = @LOWDOWN_LIBS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
-RAPIDCHECK_HEADERS = @RAPIDCHECK_HEADERS@
 SHELL = @bash@
 SODIUM_LIBS = @SODIUM_LIBS@
 SQLITE3_LIBS = @SQLITE3_LIBS@
@@ -36,12 +38,10 @@ checkbindir = @checkbindir@
 checklibdir = @checklibdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-doc_generate = @doc_generate@
 docdir = @docdir@
 embedded_sandbox_shell = @embedded_sandbox_shell@
 exec_prefix = @exec_prefix@
 includedir = @includedir@
-internal_api_docs = @internal_api_docs@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@