Merge branch 'master' into update-frontpage

Author: fricklerhandwerk

README.md

@@ -1,5 +1,4 @@
-<img alt="CI"
-     src="https://github.com/nix-dot-dev/nix.dev/workflows/CI/badge.svg">
+[![](https://github.com/NixOS/nix.dev/actions/workflows/build-and-deploy.yml/badge.svg)](https://github.com/NixOS/nix.dev/actions)
 
 # [nix.dev](https://nix.dev)
 

_redirects

@@ -32,8 +32,12 @@
 /tutorials/file-sets /tutorials/working-with-local-files 301
 /tutorials/module-system/module-system /tutorials/module-system/deep-dive 301
 
+/acknowledgments /acknowledgements 301
+/acknowledgments/sponsors /acknowledgements 301
+
 /permalink/stub-ld /guides/faq#how-to-run-non-nix-executables 301
 /manual/nix /reference/nix-manual 200
 /manual/nix/unstable/* https://hydra.nixos.org/job/nix/master/manual/latest/download/1/manual/:splat 200
 /manual/nix/development/* https://hydra.nixos.org/job/nix/master/manual/latest/download/1/manual/:splat 200
 /tutorials/nixos/continuous-integration-github-actions /guides/recipes/continuous-integration-github-actions 301
+

maintainers/README.md

@@ -75,7 +75,7 @@ In addition to the team members' responsibilities, a team lead is expected to:
   - Manage permissions for the [GitHub team] and the [GitHub project board]
   - Update [NixOS calendar] events
   - Merge pull requests approved by team members
-  - Manage [the team's Open Collective page][documentation team on Open Collective]
+  - Manage [the team's Open Collective page]
 
 [GitHub team]: https://github.com/orgs/NixOS/teams/documentation-team
 [GitHub project board]: https://github.com/orgs/NixOS/projects/15
@@ -126,42 +126,7 @@ Meeting notes should contain:
 
 If you want to help immediately, please see [How to contribute to documentation](https://nix.dev/contributing/documentation).
 
-If you don't have time, consider donating to [documentation team on Open Collective].
+If you don't have time, consider donating to [documentation team on Open Collective][the team's Open Collective page].
 
-## Sponsoring
-
-- [@fricklerhandwerk] serves as the team lead since 2023-02, sponsored by [Antithesis](https://antithesis.com)
-- [@zmitchell] led the Learning Journey Working Group from 2023-03 to 2023-08, sponsored by [flox](https://floxdev.com)
-- [@infinisil] worked on the team between 2022-11 and 2024-05, sponsored by [Tweag]
-- [@lucperkins](https://github.com/lucperkins) served as the team lead from 2022-11 to 2023-01, sponsored by [Determinate Systems](https://determinate.systems)
-- [@fricklerhandwerk] served as the team lead from 2022-05 to 2022-10, sponsored by [Tweag]
-
-[@fricklerhandwerk]: https://github.com/fricklerhandwerk
-[@zmitchell]: https://github.com/zmitchell
-[Tweag]: https://tweag.io
-[@infinisil]: https://github.com/infinisil
-
-## History
-
-Many thanks to past members, who helped make Nix documentation what it is today:
-
-- [@infinisil] helped lead the team between 2022-11 and 2024-05.
-  During that time he provided diligent technical reviews of countless contributions, reworked the [contribution guides for Nixpkgs](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md), and rewrote his [module system tutorial](https://nix.dev/tutorials/module-system/deep-dive) for publication.
-
-- [@olafklingt](https://github.com/olafklingt) volunteered on the team from 2022-10 to 2024-05, and was a formal member between 2022-10 and 2024-05.
-  He added an [introduction to NixOS virtual machines](https://nix.dev/tutorials/nixos/nixos-configuration-on-vm) and greatly simplified the [tutorial on NixOS VM tests](https://nix.dev/tutorials/nixos/integration-testing-using-virtual-machines), and kept them up to date.
-  Both articles enjoy great popularity and are central elements of our tutorial series.
-
-- [@brianmcgee](https://github.com/brianmcgee) was part of the team from 2023-03 to 2023-10 and contributed to the Learning Journey Working Group effort.
-
-- [@zmitchell] led the [Learning Journey Working Group](https://discourse.nixos.org/search?q=learning%20journey%20working%20group%20-%20meeting%20notes%20in%3Atitle%20order%3Alatest_topic) from 2023-03 to 2023-08 that added a number of tutorials.
-  He published [regular updates on developments in documentation](https://discourse.nixos.org/search?q=This%20Month%20in%20Nix%20Docs%20in%3Atitle%20before%3A2023-10-30%20order%3Alatest_topic) in that period.
-
-- [@Mic92](https://github.com/Mic92) was a founding member and part of the team from 2022-05 to 2023-01.
-  Jörg had written a great deal of documentation on the NixOS Wiki, and shared his experience to set a direction for the documentation team.
-
-- [@domenkozar](https://github.com/domenkozar) was a founding member and part of the team from 2022-05 to 2023-01.
-  Domen originally started nix.dev, wrote many basic tutorials, and funded editorial work through [Cachix](https://www.cachix.org/).
-  He helped bootstrap the documentation team, handed out permissions, and advised us on many aspects.
-  Domen donated nix.dev to the NixOS Foundation 2023-07.
+[the team' Open Collective page]: https://opencollective.com/nixos/projects/nix-documentation
 

source/acknowledgements/index.md

@@ -0,0 +1,41 @@
+(acknowledgements)=
+# Acknowledgements
+
+## Sponsoring
+
+The following people and organisations have contributed to make this effort possible:
+
+- [@fricklerhandwerk] serves as the team lead since 2023-02, sponsored by [Antithesis](https://antithesis.com) from 2023-02 to 2024-04
+- [@zmitchell] led the Learning Journey Working Group from 2023-03 to 2023-08, sponsored by [flox](https://floxdev.com)
+- [@infinisil] worked on the team between 2022-11 and 2024-05, sponsored by [Tweag]
+- [@lucperkins](https://github.com/lucperkins) served as the team lead from 2022-11 to 2023-01, sponsored by [Determinate Systems](https://determinate.systems)
+- [@fricklerhandwerk] served as the team lead from 2022-05 to 2022-10, sponsored by [Tweag]
+
+[@fricklerhandwerk]: https://github.com/fricklerhandwerk
+[@zmitchell]: https://github.com/zmitchell
+[Tweag]: https://tweag.io
+[@infinisil]: https://github.com/infinisil
+
+## History
+
+Many thanks to past contributors, who helped make Nix documentation what it is today:
+
+- [@infinisil] helped lead the team between 2022-11 and 2024-05.
+  During that time he provided diligent technical reviews of countless contributions, reworked the [contribution guides for Nixpkgs](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md), and rewrote his [module system tutorial](https://nix.dev/tutorials/module-system/deep-dive) for publication.
+
+- [@olafklingt](https://github.com/olafklingt) volunteered on the team from 2022-10 to 2024-05, and was a formal member between 2022-10 and 2024-05.
+  He added an [introduction to NixOS virtual machines](https://nix.dev/tutorials/nixos/nixos-configuration-on-vm) and greatly simplified the [tutorial on NixOS VM tests](https://nix.dev/tutorials/nixos/integration-testing-using-virtual-machines), and kept them up to date.
+  Both articles enjoy great popularity and are central elements of our tutorial series.
+
+- [@brianmcgee](https://github.com/brianmcgee) was part of the team from 2023-03 to 2023-10 and contributed to the Learning Journey Working Group effort.
+
+- [@zmitchell] led the [Learning Journey Working Group](https://discourse.nixos.org/search?q=learning%20journey%20working%20group%20-%20meeting%20notes%20in%3Atitle%20order%3Alatest_topic) from 2023-03 to 2023-08 that added a number of tutorials.
+  He published [regular updates on developments in documentation](https://discourse.nixos.org/search?q=This%20Month%20in%20Nix%20Docs%20in%3Atitle%20before%3A2023-10-30%20order%3Alatest_topic) in that period.
+
+- [@Mic92](https://github.com/Mic92) was a founding member and part of the team from 2022-05 to 2023-01.
+  Jörg had written a great deal of documentation on the NixOS Wiki, and shared his experience to set a direction for the documentation team.
+
+- [@domenkozar](https://github.com/domenkozar) was a founding member and part of the team from 2022-05 to 2023-01.
+  Domen originally started nix.dev, wrote many basic tutorials, and funded editorial work through [Cachix](https://www.cachix.org/).
+  He helped bootstrap the documentation team, handed out permissions, and advised us on many aspects.
+  Domen donated nix.dev to the NixOS Foundation 2023-07.

source/acknowledgments/index.md

@@ -2,20 +2,22 @@
 # How to contribute
 
 The Nix ecosystem is developed by many volunteers and a few paid developers, maintaining one of the largest open source software distributions in the world.
-Keeping it working and up to date – and improving it continuously – would not be possible without your support.
+Keeping it working and up to date – and improving it continuously – would not be possible without your support!
 
 This guide shows how you can contribute to {term}`Nix`, {term}`Nixpkgs` or {term}`NixOS`.
+It assumes that you're already somewhat proficient with basic concepts and workflows, which are outlined in the [beginner tutorial series](tutorials).
+The most important aspects are [the Nix language](reading-nix-language), the various Nixpkgs mechanisms for [constructing derivations to build software](packaging-tutorial)</a>, [the module system](module-system-tutorial), and [NixOS integration tests](integration-testing-vms).
 
 :::{important}
 If you cannot contribute time, consider [donating to the NixOS Foundation on Open Collective](https://opencollective.com/nixos).
 
-Currently the focus is on funding in-person events to share knowledge and grow the community of developers proficient with Nix.
+Currently the focus is on [funding in-person events](https://github.com/NixOS/foundation/issues?q=is%3Aissue%20label%3Afunding-request%20) to share knowledge and grow the community of developers proficient with Nix.
 With enough budget, it would be possible to pay for ongoing maintenance and development of critical infrastructure and code – demanding work that we cannot expect to be done by volunteers indefinitely.
 :::
 
 ## Getting started
 
-Start with asking informed questions, after reading reference documentation and the code relevant to what you care about.
+Start with asking informed questions, after reading [reference documentation](reference) and the code relevant to what you care about.
 
 [Join our community communication platforms](https://nixos.org/community) to get in contact with other users and developers.
 Check out and consider participating in our [community teams](https://nixos.org/community/#governance-teams) if you're interested in a particular topic.
@@ -89,6 +91,10 @@ If you want to help with development, check the [contributing guide in the Nix r
 (contribute-nixpkgs)=
 ## Contribute to Nixpkgs
 
+:::{tip}
+For a verbal introduction, watch the NixCon 2024 talk [Becoming a Nixpkgs Contributor](https://www.youtube.com/watch?v=eijTOBBbCv4).
+:::
+
 {term}`Nixpkgs` is a large software project with various areas of development.
 You can find inspiration for things to improve in the [Nixpkgs issue tracker][nixpkgs issues].
 
@@ -111,3 +117,6 @@ If you know your way around, working on [popular issues][nixos issues] will be h
 
 [nixos issues]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%226.topic%3A+nixos%22+sort%3Areactions-%2B1-desc
 
+# How to get help
+
+If you prepared a pull request and need help moving forward, check [](contributing-how-to-get-help) for

source/acknowledgments/sponsors.md

@@ -1,3 +1,4 @@
+(contributing-how-to-get-help)=
 # How to get help
 
 If you need assistance with one of your contributions, there are a few places you
@@ -20,9 +21,9 @@ For better efficiency and higher chance of success, you should try contacting in
 
 ## Which communication channels to use
 
-Once you've found the people you're looking for, you can contact them on one of the following platforms:
+Once you've found the people you're looking for, you can contact them on one of the [community communication platforms](https://nixos.org/community):
 
-- GitHub
+- [GitHub](https://github.com/nixos)
 
   All the source code is maintained on GitHub.
   This is the right place to discuss implementation details.
@@ -51,7 +52,7 @@ Once you've found the people you're looking for, you can contact them on one of
 
 - Meetings and events
 
-  Check the [Discourse community calendar](https://discourse.nixos.org/t/community-calendar/18589) for real-time or in-person events.
+  Check the [official NixOS Calendar](https://calendar.google.com/calendar/u/0/[email protected]) and the [Discourse community calendar](https://discourse.nixos.org/t/community-calendar/18589) for real-time or in-person events.
   Some community teams hold regular meetings and publish their meeting notes.
 
 ## Other venues

source/contributing/how-to-contribute.md

@@ -72,40 +72,10 @@ jobs:
 Once you commit and push to your GitHub repository,
 you should see status checks appearing on commits and PRs.
 
-## Caching builds using GitHub Actions Cache
-
-A quick and easy way to speed up CI on any GitHub repository is to use the [Magic Nix Cache][magic-nix-cache].
-The Magic Nix Cache doesn't require any configuration, secrets, or credentials.
-This means the caching benefits automatically work for anyone who forks the repository.
-
-One downside to the Magic Nix Cache is it only works inside GitHub Actions.
-For more details, check out [the readme][magic-nix-cache] and the [limits of GitHub Actions caching][github-actions-caching-limits].
-
-Create `.github/workflows/test.yml` with:
-
-```yaml
-name: "Test"
-on:
-  pull_request:
-  push:
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v25
-      with:
-        nix_path: nixpkgs=channel:nixos-unstable
-    - uses: DeterminateSystems/magic-nix-cache-action@v2
-    - run: nix-build
-    - run: nix-shell --run "echo OK"
-```
-
 ## Next steps
 
 - See [GitHub Actions workflow syntax](https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions)
 - To quickly setup a Nix project read through
   [Getting started Nix template](https://github.com/nix-dot-dev/getting-started-nix-template).
 
-[magic-nix-cache]: https://github.com/DeterminateSystems/magic-nix-cache-action/
 [github-actions-caching-limits]: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows

source/contributing/how-to-get-help.md

@@ -110,5 +110,5 @@ guides/index.md
 reference/index.md
 concepts/index.md
 contributing/index.md
-acknowledgments/index.md
+acknowledgements/index.md
 ```

source/guides/recipes/continuous-integration-github-actions.md

@@ -1111,7 +1111,7 @@ Each of them is explained in the following, and here is an overview:
   { a, b, ... }@args: a + b + args.c
   ```
 
-Functions have no names.
+Functions in the Nix language have no names.
 We say they are anonymous, and call such a function a *lambda*.[^lambda]
 
 [^lambda]: The term *lambda* is a shorthand for [lambda abstraction](https://en.wikipedia.org/wiki/Lambda_calculus#lambdaAbstr) in the [lambda calculus](https://en.wikipedia.org/wiki/Lambda_calculus).

source/index.md

@@ -39,8 +39,8 @@ pkgs.dockerTools.buildImage {
 :::{note}
 If you're running **macOS** or any platform other than `x86_64-linux`, you'll need to either:
 
-- [Set up a remote builder](distributed-build-setup-tutorial) to build on Linux
-- {ref}`Cross compile to Linux <cross-compilation>` by replacing `pkgsLinux.hello` with `pkgs.pkgsCross.musl64.hello`
+- [Set up a remote build machine](distributed-build-setup-tutorial) to build on Linux
+- [Cross compile to Linux](cross-compilation) by replacing `pkgsLinux.hello` with `pkgs.pkgsCross.musl64.hello`
 :::
 
 We call the `dockerTools.buildImage` and pass in some parameters: