diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/.github | |
parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/.github')
-rw-r--r-- | nixpkgs/.github/CODEOWNERS | 47 | ||||
-rw-r--r-- | nixpkgs/.github/PULL_REQUEST_TEMPLATE.md | 6 | ||||
-rw-r--r-- | nixpkgs/.github/labeler.yml | 18 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/backport.yml | 2 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/basic-eval.yml | 2 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/check-maintainers-sorted.yaml | 2 | ||||
-rwxr-xr-x | nixpkgs/.github/workflows/compare-manuals.sh | 21 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/editorconfig.yml | 2 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/manual-nixos.yml | 12 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/manual-nixpkgs.yml | 2 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/manual-rendering.yml | 64 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/periodic-merge-24h.yml | 4 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/update-terraform-providers.yml | 2 |
13 files changed, 54 insertions, 130 deletions
diff --git a/nixpkgs/.github/CODEOWNERS b/nixpkgs/.github/CODEOWNERS index d831893b9018..98a7022088eb 100644 --- a/nixpkgs/.github/CODEOWNERS +++ b/nixpkgs/.github/CODEOWNERS @@ -23,7 +23,7 @@ # Libraries /lib @edolstra @infinisil -/lib/systems @alyssais @ericson2314 @matthewbauer +/lib/systems @alyssais @ericson2314 @matthewbauer @amjoseph-nixpkgs /lib/generators.nix @edolstra @Profpatsch /lib/cli.nix @edolstra @Profpatsch /lib/debug.nix @edolstra @Profpatsch @@ -37,10 +37,10 @@ /pkgs/top-level/stage.nix @Ericson2314 @matthewbauer /pkgs/top-level/splice.nix @Ericson2314 @matthewbauer /pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer -/pkgs/stdenv/generic @Ericson2314 @matthewbauer +/pkgs/stdenv/generic @Ericson2314 @matthewbauer @amjoseph-nixpkgs /pkgs/stdenv/generic/check-meta.nix @Ericson2314 @matthewbauer @piegamesde -/pkgs/stdenv/cross @Ericson2314 @matthewbauer -/pkgs/build-support/cc-wrapper @Ericson2314 +/pkgs/stdenv/cross @Ericson2314 @matthewbauer @amjoseph-nixpkgs +/pkgs/build-support/cc-wrapper @Ericson2314 @amjoseph-nixpkgs /pkgs/build-support/bintools-wrapper @Ericson2314 /pkgs/build-support/setup-hooks @Ericson2314 /pkgs/build-support/setup-hooks/auto-patchelf.sh @layus @@ -124,7 +124,7 @@ /doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda # C compilers -/pkgs/development/compilers/gcc @matthewbauer +/pkgs/development/compilers/gcc @matthewbauer @amjoseph-nixpkgs /pkgs/development/compilers/llvm @matthewbauer @RaitoBezarius # Compatibility stuff @@ -196,6 +196,11 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/tests/kea.nix @mweinelt /nixos/tests/knot.nix @mweinelt +# Web servers +/doc/builders/packages/nginx.section.md @raitobezarius +/pkgs/servers/http/nginx/ @raitobezarius +/nixos/modules/services/web-servers/nginx/ @raitobezarius + # Dhall /pkgs/development/dhall-modules @Gabriella439 @Profpatsch @ehmry /pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch @ehmry @@ -226,18 +231,13 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # VsCode Extensions /pkgs/applications/editors/vscode/extensions @jonringer -# Prometheus exporter modules and tests -/nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz -/nixos/modules/services/monitoring/prometheus/exporters.xml @WilliButz -/nixos/tests/prometheus-exporters.nix @WilliButz - # PHP interpreter, packages, extensions, tests and documentation -/doc/languages-frameworks/php.section.md @aanderse @etu @globin @ma27 @talyz -/nixos/tests/php @aanderse @etu @globin @ma27 @talyz -/pkgs/build-support/build-pecl.nix @aanderse @etu @globin @ma27 @talyz -/pkgs/development/interpreters/php @jtojnar @aanderse @etu @globin @ma27 @talyz -/pkgs/development/php-packages @aanderse @etu @globin @ma27 @talyz -/pkgs/top-level/php-packages.nix @jtojnar @aanderse @etu @globin @ma27 @talyz +/doc/languages-frameworks/php.section.md @aanderse @drupol @etu @globin @ma27 @talyz +/nixos/tests/php @aanderse @drupol @etu @globin @ma27 @talyz +/pkgs/build-support/build-pecl.nix @aanderse @drupol @etu @globin @ma27 @talyz +/pkgs/development/interpreters/php @jtojnar @aanderse @drupol @etu @globin @ma27 @talyz +/pkgs/development/php-packages @aanderse @drupol @etu @globin @ma27 @talyz +/pkgs/top-level/php-packages.nix @jtojnar @aanderse @drupol @etu @globin @ma27 @talyz # Podman, CRI-O modules and related /nixos/modules/virtualisation/containers.nix @zowoq @adisbladis @@ -293,14 +293,14 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/development/compilers/dotnet @IvarWithoutBones # Node.js -/pkgs/build-support/node/build-npm-package @winterqt -/pkgs/build-support/node/fetch-npm-deps @winterqt -/doc/languages-frameworks/javascript.section.md @winterqt +/pkgs/build-support/node/build-npm-package @lilyinstarlight @winterqt +/pkgs/build-support/node/fetch-npm-deps @lilyinstarlight @winterqt +/doc/languages-frameworks/javascript.section.md @lilyinstarlight @winterqt # OCaml -/pkgs/build-support/ocaml @romildo @ulrikstrid -/pkgs/development/compilers/ocaml @romildo @ulrikstrid -/pkgs/development/ocaml-modules @romildo @ulrikstrid +/pkgs/build-support/ocaml @ulrikstrid +/pkgs/development/compilers/ocaml @ulrikstrid +/pkgs/development/ocaml-modules @ulrikstrid # ZFS pkgs/os-specific/linux/zfs @raitobezarius @@ -308,3 +308,6 @@ nixos/lib/make-single-disk-zfs-image.nix @raitobezarius nixos/lib/make-multi-disk-zfs-image.nix @raitobezarius nixos/modules/tasks/filesystems/zfs.nix @raitobezarius nixos/tests/zfs.nix @raitobezarius + +# Linux Kernel +pkgs/os-specific/linux/kernel/manual-config.nix @amjoseph-nixpkgs diff --git a/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md b/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md index 4fb4c0f68f9b..4517080bb301 100644 --- a/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md +++ b/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md @@ -1,11 +1,11 @@ -###### Description of changes +## Description of changes <!-- For package updates please link to a changelog or describe changes, this helps your fellow maintainers discover breaking updates. For new packages please briefly describe the package or provide a link to its homepage. --> -###### Things done +## Things done <!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. --> @@ -22,7 +22,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/`) -- [23.11 Release Notes (or backporting 23.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2305-release-notes) +- [23.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2311.section.md) (or backporting [23.05 Release notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2305.section.md)) - [ ] (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 diff --git a/nixpkgs/.github/labeler.yml b/nixpkgs/.github/labeler.yml index 44e5dcbf657d..941cc65e6d07 100644 --- a/nixpkgs/.github/labeler.yml +++ b/nixpkgs/.github/labeler.yml @@ -64,6 +64,9 @@ - pkgs/build-support/kernel/**/* - pkgs/os-specific/linux/kernel/**/* +"6.topic: lib": + - lib/** + "6.topic: lua": - pkgs/development/interpreters/lua-5/**/* - pkgs/development/interpreters/luajit/**/* @@ -83,6 +86,13 @@ - nixos/tests/mate.nix - pkgs/desktops/mate/**/* +"6.topic: module system": + - lib/modules.nix + - lib/types.nix + - lib/options.nix + - lib/tests/modules.sh + - lib/tests/modules/** + "6.topic: nixos": - nixos/**/* - pkgs/os-specific/linux/nixos-rebuild/**/* @@ -93,6 +103,14 @@ - pkgs/development/nim-packages/**/* - pkgs/top-level/nim-packages.nix +"6.topic: nodejs": + - doc/languages-frameworks/javascript.section.md + - pkgs/build-support/node/**/* + - pkgs/development/node-packages/**/* + - pkgs/development/tools/yarn/* + - pkgs/development/tools/yarn2nix-moretea/**/* + - pkgs/development/web/nodejs/* + "6.topic: ocaml": - doc/languages-frameworks/ocaml.section.md - pkgs/development/compilers/ocaml/**/* diff --git a/nixpkgs/.github/workflows/backport.yml b/nixpkgs/.github/workflows/backport.yml index 60ceb304ee8a..81fc5306fea1 100644 --- a/nixpkgs/.github/workflows/backport.yml +++ b/nixpkgs/.github/workflows/backport.yml @@ -24,7 +24,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs - uses: korthout/backport-action@v1.2.0 + uses: korthout/backport-action@v1.3.1 with: # Config README: https://github.com/korthout/backport-action#backport-action copy_labels_pattern: 'severity:\ssecurity' diff --git a/nixpkgs/.github/workflows/basic-eval.yml b/nixpkgs/.github/workflows/basic-eval.yml index 3af716e88976..272447ecee87 100644 --- a/nixpkgs/.github/workflows/basic-eval.yml +++ b/nixpkgs/.github/workflows/basic-eval.yml @@ -19,7 +19,7 @@ jobs: # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v21 + - uses: cachix/install-nix-action@v22 - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/nixpkgs/.github/workflows/check-maintainers-sorted.yaml b/nixpkgs/.github/workflows/check-maintainers-sorted.yaml index c72679af4a9e..652ddd07496a 100644 --- a/nixpkgs/.github/workflows/check-maintainers-sorted.yaml +++ b/nixpkgs/.github/workflows/check-maintainers-sorted.yaml @@ -16,7 +16,7 @@ jobs: 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@v21 + - uses: cachix/install-nix-action@v22 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/nixpkgs/.github/workflows/compare-manuals.sh b/nixpkgs/.github/workflows/compare-manuals.sh deleted file mode 100755 index b2cc68c7831d..000000000000 --- a/nixpkgs/.github/workflows/compare-manuals.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p html-tidy - -set -euo pipefail -shopt -s inherit_errexit - -normalize() { - tidy \ - --anchor-as-name no \ - --coerce-endtags no \ - --escape-scripts no \ - --fix-backslash no \ - --fix-style-tags no \ - --fix-uri no \ - --indent yes \ - --wrap 0 \ - < "$1" \ - 2> /dev/null -} - -diff -U3 <(normalize "$1") <(normalize "$2") diff --git a/nixpkgs/.github/workflows/editorconfig.yml b/nixpkgs/.github/workflows/editorconfig.yml index f62ab05da452..e72f706deff1 100644 --- a/nixpkgs/.github/workflows/editorconfig.yml +++ b/nixpkgs/.github/workflows/editorconfig.yml @@ -28,7 +28,7 @@ jobs: 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@v21 + - uses: cachix/install-nix-action@v22 with: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 diff --git a/nixpkgs/.github/workflows/manual-nixos.yml b/nixpkgs/.github/workflows/manual-nixos.yml index 30cecf607d17..9862d8d72434 100644 --- a/nixpkgs/.github/workflows/manual-nixos.yml +++ b/nixpkgs/.github/workflows/manual-nixos.yml @@ -18,7 +18,7 @@ jobs: 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@v21 + - uses: cachix/install-nix-action@v22 with: # explicitly enable sandbox extra_nix_config: sandbox = true @@ -27,13 +27,5 @@ jobs: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' - - name: Building NixOS manual with DocBook options + - name: Building NixOS manual run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true nixos/release.nix -A manual.x86_64-linux - - name: Building NixOS manual with Markdown options - run: | - export NIX_PATH=nixpkgs=$(pwd) - nix-build \ - --option restrict-eval true \ - --arg configuration '{ documentation.nixos.options.allowDocBook = false; }' \ - nixos/release.nix \ - -A manual.x86_64-linux diff --git a/nixpkgs/.github/workflows/manual-nixpkgs.yml b/nixpkgs/.github/workflows/manual-nixpkgs.yml index 43ee63af127d..812907ab84e2 100644 --- a/nixpkgs/.github/workflows/manual-nixpkgs.yml +++ b/nixpkgs/.github/workflows/manual-nixpkgs.yml @@ -19,7 +19,7 @@ jobs: 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@v21 + - uses: cachix/install-nix-action@v22 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/nixpkgs/.github/workflows/manual-rendering.yml b/nixpkgs/.github/workflows/manual-rendering.yml deleted file mode 100644 index dbaea583ef7d..000000000000 --- a/nixpkgs/.github/workflows/manual-rendering.yml +++ /dev/null @@ -1,64 +0,0 @@ -name: "Check NixOS Manual DocBook rendering against MD rendering" - - -on: - schedule: - # * is a special character in YAML so you have to quote this string - # Check every 24 hours - - cron: '0 0 * * *' - -permissions: - contents: read - -jobs: - check-rendering-equivalence: - permissions: - pull-requests: write # for peter-evans/create-or-update-comment to create or update comment - if: github.repository_owner == 'NixOS' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v21 - with: - # explicitly enable sandbox - extra_nix_config: sandbox = true - - uses: cachix/cachix-action@v12 - 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 }}' - - - name: Build DocBook and MD manuals - run: | - export NIX_PATH=nixpkgs=$(pwd) - nix-build \ - --option restrict-eval true \ - -o docbook nixos/release.nix \ - -A manual.x86_64-linux - nix-build \ - --option restrict-eval true \ - --arg configuration '{ documentation.nixos.options.allowDocBook = false; }' \ - -o md nixos/release.nix \ - -A manual.x86_64-linux - - - name: Compare DocBook and MD manuals - id: check - run: | - export NIX_PATH=nixpkgs=$(pwd) - .github/workflows/compare-manuals.sh \ - docbook/share/doc/nixos/options.html \ - md/share/doc/nixos/options.html - - # if the manual can't be built we don't want to notify anyone. - # while this may temporarily hide rendering failures it will be a lot - # less noisy until all nixpkgs pull requests have stopped using - # docbook for option docs. - - name: Comment on failure - uses: peter-evans/create-or-update-comment@v3 - if: ${{ failure() && steps.check.conclusion == 'failure' }} - with: - issue-number: 189318 - body: | - Markdown and DocBook manuals do not agree. - - Check https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }} for details. diff --git a/nixpkgs/.github/workflows/periodic-merge-24h.yml b/nixpkgs/.github/workflows/periodic-merge-24h.yml index dd0c1a233300..abfb51244fd6 100644 --- a/nixpkgs/.github/workflows/periodic-merge-24h.yml +++ b/nixpkgs/.github/workflows/periodic-merge-24h.yml @@ -34,10 +34,6 @@ jobs: pairs: - from: master into: haskell-updates - - from: release-22.11 - into: staging-next-22.11 - - from: staging-next-22.11 - into: staging-22.11 - from: release-23.05 into: staging-next-23.05 - from: staging-next-23.05 diff --git a/nixpkgs/.github/workflows/update-terraform-providers.yml b/nixpkgs/.github/workflows/update-terraform-providers.yml index 1276a0867aac..e7767dbffa65 100644 --- a/nixpkgs/.github/workflows/update-terraform-providers.yml +++ b/nixpkgs/.github/workflows/update-terraform-providers.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v21 + - uses: cachix/install-nix-action@v22 with: nix_path: nixpkgs=channel:nixpkgs-unstable - name: setup |