Commit 000b5872 authored by John Ericson's avatar John Ericson
Browse files

Merge remote-tracking branch 'upstream/master' into openbsd-static

parents 676df1cf 2ae9aee1

.envrc

0 → 100644
+1 −0
Original line number Diff line number Diff line 
use nix

.git-blame-ignore-revs

+14 −0
Original line number Diff line number Diff line
@@ -121,3 +121,17 @@ c759efa5e7f825913f9a69ef20f025f50f56dc4d 


# python3Packages: format with nixfmt

59b1aef59071cae6e87859dc65de973d2cc595c0



# treewide description changes (#317959)

bf995e3641950f4183c1dd9010349263dfa0123b

755b915a158c9d588f08e9b08da9f7f3422070cc

f8c4a98e8e138e21353a2c33b90db3359f539b37



# vscode-extensions.*: format with nixfmt (RFC 166)

7bf9febfa6271012b1ef86647a3a06f06875fdcf



# remove uses of mdDoc (#303841)

1a24330f792c8625746d07d842290e6fd95ae6f9

acd0e3898feb321cb9a71a0fd376f1157d0f4553

1b28414d2886c57343864326dbb745a634d3e37d

6afb255d976f85f3359e4929abd6f5149c323a02

.github/CODEOWNERS

+13 −9
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
# Develompent support

/.editorconfig @Mic92 @zowoq

/shell.nix @infinisil @NixOS/Security

/.envrc @infinisil @NixOS/Security



# Libraries

/lib                        @infinisil
@@ -53,7 +54,7 @@ 
/pkgs/build-support/setup-hooks/auto-patchelf.py @layus

/pkgs/pkgs-lib                                   @infinisil

## Format generators/serializers

/pkgs/pkgs-lib/formats/libconfig                 @ckiee @h7x4

/pkgs/pkgs-lib/formats/libconfig                 @h7x4

/pkgs/pkgs-lib/formats/hocon                     @h7x4



# pkgs/by-name
@@ -108,6 +109,9 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius 
# NixOS QEMU virtualisation

/nixos/virtualisation/qemu-vm.nix           @raitobezarius



# ACME

/nixos/modules/security/acme                @arianvp @flokli @aanderse # no merge permission: @m1cr0man @emilazy



# Systemd

/nixos/modules/system/boot/systemd.nix      @NixOS/systemd

/nixos/modules/system/boot/systemd          @NixOS/systemd
@@ -129,8 +133,11 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius 
/pkgs/common-updater/scripts/update-source-version    @jtojnar



# Python-related code and docs

/doc/languages-frameworks/python.section.md                 @mweinelt

/pkgs/development/interpreters/python/hooks

/doc/languages-frameworks/python.section.md   @mweinelt @natsukium

/maintainers/scripts/update-python-libraries            @natsukium

/pkgs/development/interpreters/python                   @natsukium

/pkgs/top-level/python-packages.nix                     @natsukium

/pkgs/top-level/release-python.nix                      @natsukium



# Haskell

/doc/languages-frameworks/haskell.section.md  @sternenseemann @maralorn @ncfavier
@@ -225,18 +232,15 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/nixos/modules/services/networking/ntp @thoughtpolice



# Network

/pkgs/tools/networking/octodns @Janik-Haag

/pkgs/tools/networking/kea/default.nix @mweinelt

/pkgs/tools/networking/babeld/default.nix @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
@@ -322,9 +326,9 @@ pkgs/by-name/fo/forgejo/package.nix @adamcstephens @bendlas @emilylange 
/doc/languages-frameworks/dotnet.section.md @corngood



# Node.js

/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

/pkgs/build-support/node/build-npm-package      @winterqt

/pkgs/build-support/node/fetch-npm-deps         @winterqt

/doc/languages-frameworks/javascript.section.md @winterqt



# environment.noXlibs option aka NoX

/nixos/modules/config/no-x-libs.nix  @SuperSandro2000

.github/labeler.yml

+9 −2
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ 
        - nixos/modules/services/editors/emacs.nix

        - nixos/modules/services/editors/emacs.xml

        - nixos/tests/emacs-daemon.nix

        - pkgs/applications/editors/emacs/build-support/**/*

        - pkgs/applications/editors/emacs/elisp-packages/**/*

        - pkgs/applications/editors/emacs/**/*

        - pkgs/build-support/emacs/**/*

        - pkgs/top-level/emacs-packages.nix



"6.topic: Enlightenment DE":
@@ -74,6 +74,13 @@ 
        - lib/systems/flake-systems.nix

        - nixos/modules/config/nix-flakes.nix



"6.topic: flutter":

  - any:

    - changed-files:

      - any-glob-to-any-file:

        - pkgs/build-support/flutter/*.nix

        - pkgs/development/compilers/flutter/**/*.nix



"6.topic: GNOME":

  - any:

    - changed-files:
@@ -149,7 +156,7 @@ 
  - any:

    - changed-files:

      - any-glob-to-any-file:

        - pkgs/development/compilers/llvm/*

        - pkgs/development/compilers/llvm/**/*



"6.topic: lua":

  - any:

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

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ jobs: 


            if [[ "$mergeable" == "null" ]]; then

              if (( retryCount == 0 )); then

                echo "Not retrying anymore, probably GitHub is having internal issues"

                echo "Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com/"

                exit 1

              else

                (( retryCount -= 1 )) || true