Merge branch 'NixOS:master' into wenjinnn/hiddify-next

.git-blame-ignore-revs

@@ -105,3 +105,19 @@ fb0e5be84331188a69b3edd31679ca6576edb75a
 
 # {pkgs/development/cuda-modules,pkgs/test/cuda,pkgs/top-level/cuda-packages.nix}: reformat all CUDA files with nixfmt-rfc-style 2023-03-01
 802a1b4d3338f24cbc4efd704616654456d75a94
+
+# postgresql: move packages.nix to ext/default.nix
+719034f6f6749d624faa28dff259309fc0e3e730
+
+# php ecosystem: reformat with nixfmt-rfc-style
+75ae7621330ff8db944ce4dff4374e182d5d151f
+c759efa5e7f825913f9a69ef20f025f50f56dc4d
+
+# pkgs/os-specific/bsd: Reformat with nixfmt-rfc-style 2024-03-01
+3fe3b055adfc020e6a923c466b6bcd978a13069a
+
+# k3s: format with nixfmt-rfc-style
+6cfcd3c75428ede517bc6b15a353d704837a2830
+
+# python3Packages: format with nixfmt
+59b1aef59071cae6e87859dc65de973d2cc595c0

.github/CODEOWNERS

@@ -13,7 +13,6 @@
 
 # GitHub actions
 /.github/workflows @NixOS/Security @Mic92 @zowoq
-/.github/workflows/merge-staging @FRidh
 
 # EditorConfig
 /.editorconfig @Mic92 @zowoq
@@ -42,7 +41,7 @@
 /pkgs/top-level/splice.nix @Ericson2314
 /pkgs/top-level/release-cross.nix @Ericson2314
 /pkgs/stdenv/generic @Ericson2314
-/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @piegamesde
+/pkgs/stdenv/generic/check-meta.nix @Ericson2314
 /pkgs/stdenv/cross @Ericson2314
 /pkgs/build-support/cc-wrapper @Ericson2314
 /pkgs/build-support/bintools-wrapper @Ericson2314
@@ -55,7 +54,7 @@
 /pkgs/pkgs-lib/formats/hocon @h7x4
 
 # pkgs/by-name
-/pkgs/test/nixpkgs-check-by-name @infinisil
+/pkgs/test/check-by-name @infinisil
 /pkgs/by-name/README.md @infinisil
 /pkgs/top-level/by-name-overlay.nix @infinisil
 /.github/workflows/check-by-name.yml @infinisil
@@ -125,10 +124,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius @ma27
 /pkgs/common-updater/scripts/update-source-version @jtojnar
 
 # Python-related code and docs
-/maintainers/scripts/update-python-libraries @FRidh
-/pkgs/development/interpreters/python @FRidh
-/doc/languages-frameworks/python.section.md @FRidh @mweinelt
-/pkgs/development/interpreters/python/hooks @FRidh @jonringer
+/doc/languages-frameworks/python.section.md @mweinelt
+/pkgs/development/interpreters/python/hooks @jonringer
 
 # Haskell
 /doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn @ncfavier
@@ -140,18 +137,14 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius @ma27
 /pkgs/top-level/haskell-packages.nix @sternenseemann @maralorn @ncfavier
 
 # Perl
-/pkgs/development/interpreters/perl @stigtsp @zakame @dasJ
-/pkgs/top-level/perl-packages.nix @stigtsp @zakame @dasJ
-/pkgs/development/perl-modules @stigtsp @zakame @dasJ
+/pkgs/development/interpreters/perl @stigtsp @zakame @dasJ @marcusramberg
+/pkgs/top-level/perl-packages.nix @stigtsp @zakame @dasJ @marcusramberg
+/pkgs/development/perl-modules @stigtsp @zakame @dasJ @marcusramberg
 
 # R
 /pkgs/applications/science/math/R @jbedo
 /pkgs/development/r-modules @jbedo
 
-# Ruby
-/pkgs/development/interpreters/ruby @marsam
-/pkgs/development/ruby-modules @marsam
-
 # Rust
 /pkgs/development/compilers/rust @Mic92 @zowoq @winterqt @figsoda
 /pkgs/build-support/rust @zowoq @winterqt @figsoda
@@ -185,20 +178,20 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /lib/licenses.nix @alyssais
 
 # Qt
-/pkgs/development/libraries/qt-5 @NixOS/qt-kde
-/pkgs/development/libraries/qt-6 @NixOS/qt-kde
+/pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel
+/pkgs/development/libraries/qt-6 @K900 @NickCao @SuperSandro2000 @ttuegel
 
 # KDE / Plasma 5
-/pkgs/applications/kde @NixOS/qt-kde
-/pkgs/desktops/plasma-5 @NixOS/qt-kde
-/pkgs/development/libraries/kde-frameworks @NixOS/qt-kde
+/pkgs/applications/kde @K900 @NickCao @SuperSandro2000 @ttuegel
+/pkgs/desktops/plasma-5 @K900 @NickCao @SuperSandro2000 @ttuegel
+/pkgs/development/libraries/kde-frameworks @K900 @NickCao @SuperSandro2000 @ttuegel
 
 # KDE / Plasma 6
-/pkgs/kde @NixOS/qt-kde
-/maintainers/scripts/kde @NixOS/qt-kde
+/pkgs/kde @K900 @NickCao @SuperSandro2000 @ttuegel
+/maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel
 
 # PostgreSQL and related stuff
-/pkgs/servers/sql/postgresql @thoughtpolice @marsam
+/pkgs/servers/sql/postgresql @thoughtpolice
 /nixos/modules/services/databases/postgresql.xml @thoughtpolice
 /nixos/modules/services/databases/postgresql.nix @thoughtpolice
 /nixos/tests/postgresql.nix @thoughtpolice
@@ -232,10 +225,12 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /nixos/modules/services/networking/babeld.nix @mweinelt
 /nixos/modules/services/networking/kea.nix @mweinelt
 /nixos/modules/services/networking/knot.nix @mweinelt
+nixos/modules/services/networking/networkmanager.nix @Janik-Haag
 /nixos/modules/services/monitoring/prometheus/exporters/kea.nix @mweinelt
 /nixos/tests/babeld.nix @mweinelt
 /nixos/tests/kea.nix @mweinelt
 /nixos/tests/knot.nix @mweinelt
+/nixos/tests/networking/* @Janik-Haag
 
 # Web servers
 /doc/packages/nginx.section.md @raitobezarius
@@ -296,7 +291,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 
 # GNOME
 /pkgs/desktops/gnome @jtojnar
-/pkgs/desktops/gnome/extensions @piegamesde @jtojnar
+/pkgs/desktops/gnome/extensions   @jtojnar
 /pkgs/build-support/make-hardcode-gsettings-patch @jtojnar
 
 # Cinnamon
@@ -310,16 +305,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 # terraform providers
 /pkgs/applications/networking/cluster/terraform-providers @zowoq
 
-# Matrix
-/pkgs/servers/heisenbridge @piegamesde
-/pkgs/servers/matrix-conduit @piegamesde
-/nixos/modules/services/misc/heisenbridge.nix @piegamesde
-/nixos/modules/services/misc/matrix-conduit.nix @piegamesde
-/nixos/tests/matrix-conduit.nix @piegamesde
-
 # Forgejo
-nixos/modules/services/misc/forgejo.nix   @bendlas @emilylange
-pkgs/applications/version-management/forgejo @bendlas @emilylange
+nixos/modules/services/misc/forgejo.nix @adamcstephens @bendlas @emilylange
+pkgs/by-name/fo/forgejo/package.nix @adamcstephens @bendlas @emilylange
 
 # Dotnet
 /pkgs/build-support/dotnet @IvarWithoutBones
@@ -357,5 +345,21 @@ pkgs/development/tools/continuous-integration/buildbot @Mic92 @zowoq
 
 # Pretix
 pkgs/by-name/pr/pretix/ @mweinelt
+pkgs/by-name/pr/pretalx/ @mweinelt
 nixos/modules/services/web-apps/pretix.nix @mweinelt
+nixos/modules/services/web-apps/pretalx.nix @mweinelt
 nixos/tests/web-apps/pretix.nix @mweinelt
+nixos/tests/web-apps/pretalx.nix @mweinelt
+
+# incus/lxc/lxd
+nixos/maintainers/scripts/lxd/ @adamcstephens
+nixos/modules/virtualisation/incus.nix @adamcstephens
+nixos/modules/virtualisation/lxc* @adamcstephens
+nixos/modules/virtualisation/lxd* @adamcstephens
+nixos/tests/incus/ @adamcstephens
+nixos/tests/lxd/ @adamcstephens
+pkgs/by-name/in/incus/ @adamcstephens
+pkgs/by-name/lx/lxc* @adamcstephens
+pkgs/by-name/lx/lxd* @adamcstephens
+pkgs/os-specific/linux/lxc/ @adamcstephens
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -24,7 +24,7 @@ For new packages please briefly describe the package or provide a link to its ho
  - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages
 - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)
 - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
-- [24.05 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2405.section.md) (or backporting [23.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2305.section.md) and [23.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2311.section.md) Release notes)
+- [24.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) (or backporting [23.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2311.section.md) and [24.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2405.section.md) Release notes)
  - [ ] (Package updates) Added a release notes entry if the change is major or breaking
  - [ ] (Module updates) Added a release notes entry if the change is significant
  - [ ] (Module addition) Added a release notes entry if adding a new NixOS module

.github/labeler.yml

@@ -113,6 +113,14 @@
  - pkgs/applications/editors/jupyter-kernels/**/*
  - pkgs/applications/editors/jupyter/**/*
 
+"6.topic: k3s":
+ - any:
+ - changed-files:
+ - any-glob-to-any-file:
+ - nixos/modules/services/cluster/k3s/**/*
+ - nixos/tests/k3s/**/*
+ - pkgs/applications/networking/cluster/k3s/**/*
+
 "6.topic: kernel":
  - any:
  - changed-files:
@@ -369,3 +377,8 @@
  - changed-files:
  - any-glob-to-any-file:
  - nixos/modules/**/*
+"8.has: maintainer-list (update)":
+ - any:
+ - changed-files:
+ - any-glob-to-any-file:
+ - maintainers/maintainer-list.nix

.github/workflows/backport.yml

@@ -20,7 +20,7 @@ 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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+ - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
  with:
  ref: ${{ github.event.pull_request.head.sha }}
  - name: Create backport PRs

.github/workflows/basic-eval.yml

@@ -18,12 +18,12 @@ jobs:
  runs-on: ubuntu-latest
  # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
  steps:
- - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+ - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
  - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
- - uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14
+ - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
  with:
  # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
  name: nixpkgs-ci
  signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
  # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset
- - run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]'
+ - run: nix-build pkgs/top-level/release.nix -A release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]'

.github/workflows/check-by-name.yml

@@ -14,11 +14,16 @@ on:
  # While `edited` is also triggered when the PR title/body is changed,
  # this PR action is fairly quick, and PR's don't get edited that often,
  # so it shouldn't be a problem
+ # There is a feature request for adding a `base_changed` event:
+ # https://github.com/orgs/community/discussions/35058
  types: [opened, synchronize, reopened, edited]
 
-permissions:
- # We need this permission to cancel the workflow run if there's a merge conflict
- actions: write
+permissions: {}
+
+# We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit
+# trigger), and contributers would get notified on any canceled run.
+# There is a feature request for supressing notifications on concurrency-canceled runs:
+# https://github.com/orgs/community/discussions/13015
 
 jobs:
  check:
@@ -39,7 +44,7 @@ jobs:
  # https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests
 
  # Retry the API query this many times
- retryCount=3
+ retryCount=5
  # Start with 5 seconds, but double every retry
  retryInterval=5
  while true; do
@@ -72,31 +77,27 @@ jobs:
 
  if [[ "$mergeable" == "true" ]]; then
  echo "The PR can be merged, checking the merge commit $mergedSha"
+ echo "mergedSha=$mergedSha" >> "$GITHUB_ENV"
  else
- echo "The PR cannot be merged, it has a merge conflict, cancelling the workflow.."
- gh api \
- --method POST \
- -H "Accept: application/vnd.github+json" \
- -H "X-GitHub-Api-Version: 2022-11-28" \
- /repos/"$GITHUB_REPOSITORY"/actions/runs/"$GITHUB_RUN_ID"/cancel
- sleep 60
- # If it's still not canceled after a minute, something probably went wrong, just exit
- exit 1
+ echo "The PR cannot be merged, it has a merge conflict, skipping the rest.."
  fi
-  echo "mergedSha=$mergedSha" >> "$GITHUB_ENV"
- - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+ - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+  if: env.mergedSha
  with:
  # pull_request_target checks out the base branch by default
  ref: ${{ env.mergedSha }}
  # Fetches the merge commit and its parents
  fetch-depth: 2
  - name: Checking out base branch
+ if: env.mergedSha
  run: |
  base=$(mktemp -d)
  git worktree add "$base" "$(git rev-parse HEAD^1)"
  echo "base=$base" >> "$GITHUB_ENV"
  - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
+ if: env.mergedSha
  - name: Fetching the pinned tool
+ if: env.mergedSha
  # Update the pinned version using pkgs/test/check-by-name/update-pinned-tool.sh
  run: |
  # The pinned version of the tooling to use
@@ -107,6 +108,11 @@ jobs:
  # Adds a result symlink as a GC root
  nix-store --realise "$toolPath" --add-root result
  - name: Running nixpkgs-check-by-name
+ if: env.mergedSha
+ env:
+ # Force terminal colors to be enabled. The library that
+ # nixpkgs-check-by-name uses respects: https://bixense.com/clicolors/
+ CLICOLOR_FORCE: 1
  run: |
  if result/bin/nixpkgs-check-by-name --base "$base" .; then
  exit 0

.github/workflows/check-cherry-picks.yml

@@ -12,7 +12,7 @@ jobs:
  runs-on: ubuntu-latest
  if: github.repository_owner == 'NixOS'
  steps:
- - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+ - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
  with:
  fetch-depth: 0
  filter: blob:none

.github/workflows/check-maintainers-sorted.yaml

@@ -12,7 +12,7 @@ jobs:
  runs-on: ubuntu-latest
  if: github.repository_owner == 'NixOS'
  steps:
- - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+ - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
  with:
  # pull_request_target checks out the base branch by default
  ref: refs/pull/${{ github.event.pull_request.number }}/merge

.github/workflows/check-nix-format.yml

@@ -15,7 +15,7 @@ jobs:
  runs-on: ubuntu-latest
  if: github.repository_owner == 'NixOS'
  steps:
- - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+ - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
  with:
  # pull_request_target checks out the base branch by default
  ref: refs/pull/${{ github.event.pull_request.number }}/merge
@@ -32,11 +32,20 @@ jobs:
  # Each environment variable beginning with NIX_FMT_PATHS_ is a list of
  # paths to check with nixfmt.
  env:
+ NIX_FMT_PATHS_BSD: pkgs/os-specific/bsd
+ NIX_FMT_PATHS_MPVSCRIPTS: pkgs/applications/video/mpv/scripts
  # Format paths related to the Nixpkgs CUDA ecosystem.
  NIX_FMT_PATHS_CUDA: |
  pkgs/development/cuda-modules
  pkgs/test/cuda
  pkgs/top-level/cuda-packages.nix
+ NIX_FMT_PATHS_K3S: |
+ nixos/modules/services/cluster/k3s
+ nixos/tests/k3s
+ pkgs/applications/networking/cluster/k3s
+ NIX_FMT_PATHS_VSCODE_EXTS: pkgs/applications/editors/vscode/extensions
+ NIX_FMT_PATHS_PHP_PACKAGES: pkgs/development/php-packages
+ NIX_FMT_PATHS_BUILD_SUPPORT_PHP: pkgs/build-support/php
  # Iterate over all environment variables beginning with NIX_FMT_PATHS_.
  run: |
  for env_var in "${!NIX_FMT_PATHS_@}"; do

.github/workflows/editorconfig.yml

@@ -24,7 +24,7 @@ jobs:
  - name: print list of changed files
  run: |
  cat "$HOME/changed_files"
- - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+ - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
  with:
  # pull_request_target checks out the base branch by default
  ref: refs/pull/${{ github.event.pull_request.number }}/merge

.github/workflows/manual-nixos.yml

@@ -14,15 +14,15 @@ jobs:
  runs-on: ubuntu-latest
  if: github.repository_owner == 'NixOS'
  steps:
- - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+ - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
  with:
  # pull_request_target checks out the base branch by default
  ref: refs/pull/${{ github.event.pull_request.number }}/merge
  - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
  with:
  # explicitly enable sandbox
  extra_nix_config: sandbox = true
- - uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14
+ - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
  with:
  # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
  name: nixpkgs-ci