Merge branch 'master' into tomberek.absolute.attrpath.notation

NixOS · Sep 28, 2023 · 976f596 · 976f596
2 parents 696eb79 + 13a9090
commit 976f596
Show file tree

Hide file tree

Showing 154 changed files with 3,626 additions and 1,596 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,24 +10,6 @@
 
 <!-- Large change: Provide instructions to reviewers how to read the diff. -->
 
-# Checklist for maintainers
-
-<!-- Contributors: please leave this as is -->
-
-Maintainers: tick if completed or explain if not relevant
-
- - [ ] agreed on idea
- - [ ] agreed on implementation strategy
- - [ ] tests, as appropriate
- - functional tests - `tests/**.sh`
- - unit tests - `src/*/tests`
- - integration tests - `tests/nixos/*`
- - [ ] documentation in the manual
- - [ ] documentation in the internal API docs
- - [ ] code and comments are self-explanatory
- - [ ] commit message explains why the change was made
- - [ ] new feature or incompatible change: updated release notes
-
 # Priorities
 
 Add :+1: to [pull requests you find important](https://github.com/NixOS/nix/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc).
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -14,14 +14,14 @@ jobs:
  if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  ref: ${{ github.event.pull_request.head.sha }}
  # required to find all branches
  fetch-depth: 0
  - name: Create backport PRs
  # should be kept in sync with `version`
- uses: zeebe-io/backport-action@v1.3.1
+ uses: zeebe-io/backport-action@v1.4.0
  with:
  # Config README: https://github.com/zeebe-io/backport-action#backport-action
  github_token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,10 +17,10 @@ jobs:
  runs-on: ${{ matrix.os }}
  timeout-minutes: 60
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  fetch-depth: 0
- - uses: cachix/install-nix-action@v22
+ - uses: cachix/install-nix-action@v23
  with:
  # The sandbox would otherwise be disabled by default on Darwin
  extra_nix_config: "sandbox = true"
@@ -58,11 +58,11 @@ jobs:
  outputs:
  installerURL: ${{ steps.prepare-installer.outputs.installerURL }}
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  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@v22
+ - uses: cachix/install-nix-action@v23
  with:
  install_url: https://releases.nixos.org/nix/nix-2.13.3/install
  - uses: cachix/cachix-action@v12
@@ -82,9 +82,9 @@ jobs:
  os: [ubuntu-latest, macos-latest]
  runs-on: ${{ matrix.os }}
  steps:
- - uses: actions/checkout@v3
+ - 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@v22
+ - uses: cachix/install-nix-action@v23
  with:
  install_url: '${{needs.installer.outputs.installerURL}}'
  install_options: "--tarball-url-prefix https://${{ env.CACHIX_NAME }}.cachix.org/serve"
@@ -108,10 +108,10 @@ jobs:
  needs.check_secrets.outputs.docker == 'true'
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  fetch-depth: 0
- - uses: cachix/install-nix-action@v22
+ - uses: cachix/install-nix-action@v23
  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
@@ -127,7 +127,7 @@ jobs:
  - run: docker tag nix:$NIX_VERSION nixos/nix:$NIX_VERSION
  - run: docker tag nix:$NIX_VERSION nixos/nix:master
  - name: Login to Docker Hub
- uses: docker/login-action@v2
+ uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}
  password: ${{ secrets.DOCKERHUB_TOKEN }}

diff --git a/.github/workflows/hydra_status.yml b/.github/workflows/hydra_status.yml
@@ -13,7 +13,7 @@ jobs:
  if: github.repository_owner == 'NixOS'
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  fetch-depth: 0
  - run: bash scripts/check-hydra-status.sh

diff --git a/.version b/.version
@@ -1 +1 @@
-2.18.0
+2.19.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -30,8 +30,8 @@ Check out the [security policy](https://github.com/NixOS/nix/security/policy).
 
 2. Search for related issues that cover what you're going to work on. It could help to mention there that you will work on the issue.
 
- Issues labeled ["good first issue"](https://github.com/NixOS/nix/labels/good-first-issue) should be relatively easy to fix and are likely to get merged quickly.
- Pull requests addressing issues labeled ["idea approved"](https://github.com/NixOS/nix/labels/idea%20approved) are especially welcomed by maintainers and will receive prioritised review.
+ Issues labeled [good first issue](https://github.com/NixOS/nix/labels/good-first-issue) should be relatively easy to fix and are likely to get merged quickly.
+ Pull requests addressing issues labeled [idea approved](https://github.com/NixOS/nix/labels/idea%20approved) are especially welcomed by maintainers and will receive prioritised review.
 
 3. Check the [Nix reference manual](https://nixos.org/manual/nix/unstable/contributing/hacking.html) for information on building Nix and running its tests.
 
@@ -40,14 +40,27 @@ Check out the [security policy](https://github.com/NixOS/nix/security/policy).
 4. Make your changes!
 
 5. [Create a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request) for your changes.
- * [Mark the pull request as draft](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request) if you're not done with the changes.
- * Make sure to have [a clean history of commits on your branch by using rebase](https://www.digitalocean.com/community/tutorials/how-to-rebase-and-update-a-pull-request).
  * Link related issues in your pull request to inform interested parties and future contributors about your change.
+ * Make sure to have [a clean history of commits on your branch by using rebase](https://www.digitalocean.com/community/tutorials/how-to-rebase-and-update-a-pull-request).
  If your pull request closes one or multiple issues, note that in the description using `Closes: #<number>`, as it will then happen automatically when your change is merged.
+ * [Mark the pull request as draft](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request) if you're not done with the changes.
 
 6. Do not expect your pull request to be reviewed immediately.
  Nix maintainers follow a [structured process for reviews and design decisions](https://github.com/NixOS/nix/tree/master/maintainers#project-board-protocol), which may or may not prioritise your work.
 
+ Following this checklist will make the process smoother for everyone:
+
+ - [ ] Fixes an [idea approved](https://github.com/NixOS/nix/labels/idea%20approved) issue
+ - [ ] Tests, as appropriate:
+ - Functional tests – [`tests/**.sh`](./tests)
+ - Unit tests – [`src/*/tests`](./src/)
+ - Integration tests – [`tests/nixos/*`](./tests/nixos)
+ - [ ] 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
+ - [ ] New feature or incompatible change: updated [release notes](./doc/manual/src/release-notes/rl-next.md)
+
 7. If you need additional feedback or help to getting pull request into shape, ask other contributors using [@mentions](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#mentioning-people-and-teams).
 
 ## Making changes to the Nix manual

diff --git a/Makefile b/Makefile
@@ -22,6 +22,7 @@ makefiles = \
 -include Makefile.config
 
 ifeq ($(tests), yes)
+UNIT_TEST_ENV = _NIX_TEST_UNIT_DATA=unit-test-data
 makefiles += \
  src/libutil/tests/local.mk \
  src/libstore/tests/local.mk \

diff --git a/README.md b/README.md
@@ -23,13 +23,16 @@ Information on additional installation methods is available on the [Nix download
 See our [Hacking guide](https://nixos.org/manual/nix/unstable/contributing/hacking.html) in our manual for instruction on how to
 to set up a development environment and build Nix from source.
 
+## Contributing
+
+Check the [contributing guide](./CONTRIBUTING.md) if you want to get involved with developing Nix.
+
 ## Additional Resources
 
 - [Nix manual](https://nixos.org/nix/manual)
 - [Nix jobsets on hydra.nixos.org](https://hydra.nixos.org/project/nix)
 - [NixOS Discourse](https://discourse.nixos.org/)
 - [Matrix - #nix:nixos.org](https://matrix.to/#/#nix:nixos.org)
-- [IRC - #nixos on libera.chat](irc:https://irc.libera.chat/#nixos)
 
 ## License
 

diff --git a/boehmgc-coroutine-sp-fallback.diff b/boehmgc-coroutine-sp-fallback.diff
@@ -59,12 +59,18 @@ index b5d71e62..aed7b0bf 100644
  GC_bool found_me = FALSE;
  size_t nthreads = 0;
  int i;
-@@ -851,6 +853,31 @@ GC_INNER void GC_push_all_stacks(void)
+@@ -851,6 +853,37 @@ GC_INNER void GC_push_all_stacks(void)
  hi = p->altstack + p->altstack_size;
  /* FIXME: Need to scan the normal stack too, but how ? */
  /* FIXME: Assume stack grows down */
 + } else {
-+ if (pthread_getattr_np(p->id, &pattr)) {
++#ifdef HAVE_PTHREAD_ATTR_GET_NP
++ if (!pthread_attr_init(&pattr)
++ || !pthread_attr_get_np(p->id, &pattr))
++#else /* HAVE_PTHREAD_GETATTR_NP */
++ if (pthread_getattr_np(p->id, &pattr))
++#endif
++ {
 + ABORT("GC_push_all_stacks: pthread_getattr_np failed!");
 + }
 + if (pthread_attr_getstacksize(&pattr, &stack_limit)) {

diff --git a/doc/manual/generate-manpage.nix b/doc/manual/generate-manpage.nix
@@ -1,8 +1,8 @@
 let
  inherit (builtins)
- attrNames attrValues fromJSON listToAttrs mapAttrs
+ attrNames attrValues fromJSON listToAttrs mapAttrs groupBy
  concatStringsSep concatMap length lessThan replaceStrings sort;
- inherit (import ./utils.nix) concatStrings optionalString filterAttrs trim squash unique showSettings;
+ inherit (import ./utils.nix) attrsToList concatStrings optionalString filterAttrs trim squash unique showSettings;
 in
 
 commandDump:
@@ -70,25 +70,32 @@ let
  * [`${command} ${name}`](./${appendName filename name}.md) - ${subcmd.description}
  '';
 
+ # TODO: move this confusing special case out of here when implementing #8496
  maybeDocumentation = optionalString
  (details ? doc)
  (replaceStrings ["@stores@"] [storeDocs] details.doc);
 
- maybeOptions = optionalString (details.flags != {}) ''
+ maybeOptions = let
+ allVisibleOptions = filterAttrs
+ (_: o: ! o.hiddenCategory)
+ (details.flags // toplevel.flags);
+ in optionalString (allVisibleOptions != {}) ''
  # Options
 
- ${showOptions details.flags toplevel.flags}
+ ${showOptions allVisibleOptions}
+
+ > **Note**
+ >
+ > See [`man nix.conf`](@docroot@/command-ref/conf-file.md#command-line-flags) for overriding configuration settings with command line flags.
  '';
 
- showOptions = options: commonOptions:
+ showOptions = allOptions:
  let
- allOptions = options // commonOptions;
- showCategory = cat: ''
- ${optionalString (cat != "") "**${cat}:**"}
+ showCategory = cat: opts: ''
+ ${optionalString (cat != "") "## ${cat}"}
 
- ${listOptions (filterAttrs (n: v: v.category == cat) allOptions)}
+ ${concatStringsSep "\n" (attrValues (mapAttrs showOption opts))}
  '';
- listOptions = opts: concatStringsSep "\n" (attrValues (mapAttrs showOption opts));
  showOption = name: option:
  let
  shortName = optionalString
@@ -98,12 +105,17 @@ let
  (option ? labels)
  (concatStringsSep " " (map (s: "*${s}*") option.labels));
  in trim ''
- - `--${name}` ${shortName} ${labels}
+ - <span id="opt-${name}">[`--${name}`](#opt-${name})</span> ${shortName} ${labels}
 
  ${option.description}
  '';
- categories = sort lessThan (unique (map (cmd: cmd.category) (attrValues allOptions)));
- in concatStrings (map showCategory categories);
+ categories = mapAttrs
+ # Convert each group from a list of key-value pairs back to an attrset
+ (_: listToAttrs)
+ (groupBy
+ (cmd: cmd.value.category)
+ (attrsToList allOptions));
+ in concatStrings (attrValues (mapAttrs showCategory categories));
  in squash result;
 
  appendName = filename: name: (if filename == "nix" then "nix3" else filename) + "-" + name;
@@ -147,7 +159,7 @@ let
  To use this store, you need to make sure the corresponding experimental feature,
  [`${experimentalFeature}`](@docroot@/contributing/experimental-features.md#xp-feature-${experimentalFeature}),
  is enabled.
- For example, include the following in [`nix.conf`](#):
+ For example, include the following in [`nix.conf`](@docroot@/command-ref/conf-file.md):
 
  ```
  extra-experimental-features = ${experimentalFeature}

diff --git a/doc/manual/redirects.js b/doc/manual/redirects.js
@@ -343,7 +343,7 @@ const redirects = {
  "linux": "uninstall.html#linux",
  "macos": "uninstall.html#macos",
  "uninstalling": "uninstall.html",
- }
+ },
  "contributing/hacking.html": {
  "nix-with-flakes": "#building-nix-with-flakes",
  "classic-nix": "#building-nix",

diff --git a/doc/manual/src/SUMMARY.md.in b/doc/manual/src/SUMMARY.md.in
@@ -33,6 +33,7 @@
  - [Operators](language/operators.md)
  - [Derivations](language/derivations.md)
  - [Advanced Attributes](language/advanced-attributes.md)
+ - [Import From Derivation](language/import-from-derivation.md)
  - [Built-in Constants](language/builtin-constants.md)
  - [Built-in Functions](language/builtins.md)
 - [Advanced Topics](advanced-topics/advanced-topics.md)
@@ -100,6 +101,7 @@
  - [File System Object](architecture/file-system-object.md)
 - [Protocols](protocols/protocols.md)
  - [Serving Tarball Flakes](protocols/tarball-fetcher.md)
+ - [Derivation "ATerm" file format](protocols/derivation-aterm.md)
 - [Glossary](glossary.md)
 - [Contributing](contributing/contributing.md)
  - [Hacking](contributing/hacking.md)
@@ -109,6 +111,7 @@
  - [C++ style guide](contributing/cxx.md)
 - [Release Notes](release-notes/release-notes.md)
  - [Release X.Y (202?-??-??)](release-notes/rl-next.md)
+ - [Release 2.18 (2023-09-20)](release-notes/rl-2.18.md)
  - [Release 2.17 (2023-07-24)](release-notes/rl-2.17.md)
  - [Release 2.16 (2023-05-31)](release-notes/rl-2.16.md)
  - [Release 2.15 (2023-04-11)](release-notes/rl-2.15.md)

diff --git a/doc/manual/src/advanced-topics/advanced-topics.md b/doc/manual/src/advanced-topics/advanced-topics.md
@@ -1 +1 @@
-
+This section lists advanced topics related to builds and builds performance
diff --git a/doc/manual/src/advanced-topics/post-build-hook.md b/doc/manual/src/advanced-topics/post-build-hook.md
@@ -69,6 +69,8 @@ exec nix copy --to "s3:https://example-nix-cache" $OUT_PATHS
 > store sign`. Nix guarantees the paths will not contain any spaces,
 > however a store path might contain glob characters. The `set -f`
 > disables globbing in the shell.
+> If you want to upload the `.drv` file too, the `$DRV_PATH` variable
+> is also defined for the script and works just like `$OUT_PATHS`.
 
 Then make sure the hook program is executable by the `root` user: