Skip to content

Commit 82bccc2

Browse files
vcunatvcunat
committed
Merge branch 'nixpkgs-unstable' into PR #111431
I'm not really sure about the conflicts in: pkgs/development/python-modules/psutil/default.nix Hydra nixpkgs: ?compare=1666054
2 parents 16d7d40 + 267761c commit 82bccc2

9,066 files changed

Lines changed: 291215 additions & 134573 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/.github/CODEOWNERS @edolstra
1212

1313
# GitHub actions
14-
/.github/workflows @Mic92 @zowoq
14+
/.github/workflows @NixOS/Security @Mic92 @zowoq
1515
/.github/workflows/merge-staging @FRidh
1616

1717
# EditorConfig
@@ -76,13 +76,14 @@
7676
/pkgs/development/interpreters/python @FRidh
7777
/pkgs/development/python-modules @FRidh @jonringer
7878
/doc/languages-frameworks/python.section.md @FRidh
79+
/pkgs/development/tools/poetry2nix @adisbladis
7980

8081
# Haskell
81-
/pkgs/development/compilers/ghc @cdepillabout
82-
/pkgs/development/haskell-modules @cdepillabout
83-
/pkgs/development/haskell-modules/default.nix @cdepillabout
84-
/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout
85-
/pkgs/development/haskell-modules/hoogle.nix @cdepillabout
82+
/pkgs/development/compilers/ghc @cdepillabout @sternenseemann
83+
/pkgs/development/haskell-modules @cdepillabout @sternenseemann
84+
/pkgs/development/haskell-modules/default.nix @cdepillabout @sternenseemann
85+
/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout @sternenseemann
86+
/pkgs/development/haskell-modules/hoogle.nix @cdepillabout @sternenseemann
8687

8788
# Perl
8889
/pkgs/development/interpreters/perl @volth @stigtsp
@@ -94,12 +95,12 @@
9495
/pkgs/development/r-modules @peti
9596

9697
# Ruby
97-
/pkgs/development/interpreters/ruby @alyssais
98-
/pkgs/development/ruby-modules @alyssais
98+
/pkgs/development/interpreters/ruby @marsam
99+
/pkgs/development/ruby-modules @marsam
99100

100101
# Rust
101102
/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq
102-
/pkgs/build-support/rust @andir @zowoq
103+
/pkgs/build-support/rust @andir @danieldk @zowoq
103104

104105
# Darwin-related
105106
/pkgs/stdenv/darwin @NixOS/darwin-maintainers
@@ -125,9 +126,6 @@
125126
# Jetbrains
126127
/pkgs/applications/editors/jetbrains @edwtjo
127128

128-
# Eclipse
129-
/pkgs/applications/editors/eclipse @rycee
130-
131129
# Licenses
132130
/lib/licenses.nix @alyssais
133131

@@ -138,7 +136,7 @@
138136
/pkgs/development/libraries/qt-5 @ttuegel
139137

140138
# PostgreSQL and related stuff
141-
/pkgs/servers/sql/postgresql @thoughtpolice
139+
/pkgs/servers/sql/postgresql @thoughtpolice @marsam
142140
/nixos/modules/services/databases/postgresql.xml @thoughtpolice
143141
/nixos/modules/services/databases/postgresql.nix @thoughtpolice
144142
/nixos/tests/postgresql.nix @thoughtpolice

‎.github/labeler.yml‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
"6.topic: agda":
2+
- doc/languages-frameworks/agda.section.md
3+
- nixos/tests/agda.nix
4+
- pkgs/build-support/agda/**/*
5+
- pkgs/development/libraries/agda/**/*
6+
- pkgs/top-level/agda-packages.nix
7+
8+
"6.topic: bsd":
9+
- pkgs/os-specific/bsd/**/*
10+
- pkgs/stdenv/freebsd/**/*
11+
12+
"6.topic: cinnamon":
13+
- pkgs/desktops/cinnamon/**/*
14+
15+
"6.topic: emacs":
16+
- nixos/modules/services/editors/emacs.nix
17+
- nixos/modules/services/editors/emacs.xml
18+
- nixos/tests/emacs-daemon.nix
19+
- pkgs/applications/editors/emacs-modes/**/*
20+
- pkgs/applications/editors/emacs/**/*
21+
- pkgs/build-support/emacs/**/*
22+
- pkgs/top-level/emacs-packages.nix
23+
24+
"6.topic: erlang":
25+
- doc/languages-frameworks/beam.section.md
26+
- pkgs/development/beam-modules/**/*
27+
- pkgs/development/interpreters/elixir/**/*
28+
- pkgs/development/interpreters/erlang/**/*
29+
- pkgs/development/tools/build-managers/rebar/**/*
30+
- pkgs/development/tools/build-managers/rebar3/**/*
31+
- pkgs/development/tools/erlang/**/*
32+
- pkgs/top-level/beam-packages.nix
33+
34+
"6.topic: fetch":
35+
- pkgs/build-support/fetch*/**/*
36+
37+
"6.topic: GNOME":
38+
- doc/languages-frameworks/gnome.section.md
39+
- nixos/modules/services/desktops/gnome3/**/*
40+
- nixos/modules/services/x11/desktop-managers/gnome3.nix
41+
- nixos/tests/gnome3-xorg.nix
42+
- nixos/tests/gnome3.nix
43+
- pkgs/desktops/gnome-3/**/*
44+
45+
"6.topic: golang":
46+
- doc/languages-frameworks/go.section.md
47+
- pkgs/development/compilers/go/**/*
48+
- pkgs/development/go-modules/**/*
49+
- pkgs/development/go-packages/**/*
50+
51+
"6.topic: haskell":
52+
- doc/languages-frameworks/haskell.section.md
53+
- pkgs/development/compilers/ghc/**/*
54+
- pkgs/development/haskell-modules/**/*
55+
- pkgs/development/tools/haskell/**/*
56+
- pkgs/top-level/haskell-packages.nix
57+
58+
"6.topic: kernel":
59+
- pkgs/build-support/kernel/**/*
60+
- pkgs/os-specific/linux/kernel/**/*
61+
62+
"6.topic: lua":
63+
- pkgs/development/interpreters/lua-5/**/*
64+
- pkgs/development/interpreters/luajit/**/*
65+
- pkgs/development/lua-modules/**/*
66+
- pkgs/top-level/lua-packages.nix
67+
68+
"6.topic: nixos":
69+
- nixos/**/*
70+
71+
"6.topic: ocaml":
72+
- doc/languages-frameworks/ocaml.section.md
73+
- pkgs/development/compilers/ocaml/**/*
74+
- pkgs/development/compilers/reason/**/*
75+
- pkgs/development/ocaml-modules/**/*
76+
- pkgs/development/tools/ocaml/**/*
77+
- pkgs/top-level/ocaml-packages.nix
78+
79+
"6.topic: pantheon":
80+
- nixos/modules/services/desktops/pantheon/**/*
81+
- nixos/modules/services/x11/desktop-managers/pantheon.nix
82+
- nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
83+
- nixos/tests/pantheon.nix
84+
- pkgs/desktops/pantheon/**/*
85+
86+
"6.topic: policy discussion":
87+
- .github/**/*
88+
89+
"6.topic: printing":
90+
- nixos/modules/services/printing/cupsd.nix
91+
- pkgs/misc/cups/**/*
92+
93+
"6.topic: python":
94+
- doc/languages-frameworks/python.section.md
95+
- pkgs/development/interpreters/python/**/*
96+
- pkgs/development/python-modules/**/*
97+
- pkgs/top-level/python-packages.nix
98+
99+
"6.topic: qt/kde":
100+
- doc/languages-frameworks/qt.section.md
101+
- nixos/modules/services/x11/desktop-managers/plasma5.nix
102+
- nixos/tests/plasma5.nix
103+
- pkgs/applications/kde/**/*
104+
- pkgs/desktops/plasma-5/**/*
105+
- pkgs/development/libraries/kde-frameworks/**/*
106+
- pkgs/development/libraries/qt-5/**/*
107+
108+
"6.topic: ruby":
109+
- doc/languages-frameworks/ruby.section.md
110+
- pkgs/development/interpreters/ruby/**/*
111+
- pkgs/development/ruby-modules/**/*
112+
113+
"6.topic: rust":
114+
- doc/languages-frameworks/rust.section.md
115+
- pkgs/build-support/rust/**/*
116+
- pkgs/development/compilers/rust/**/*
117+
118+
"6.topic: stdenv":
119+
- pkgs/stdenv/**/*
120+
121+
"6.topic: steam":
122+
- pkgs/games/steam/**/*
123+
124+
"6.topic: systemd":
125+
- pkgs/os-specific/linux/systemd/**/*
126+
- nixos/modules/system/boot/systemd*/**/*
127+
128+
"6.topic: TeX":
129+
- doc/languages-frameworks/texlive.section.md
130+
- pkgs/tools/typesetting/tex/**/*
131+
132+
"6.topic: vim":
133+
- doc/languages-frameworks/vim.section.md
134+
- pkgs/applications/editors/vim/**/*
135+
- pkgs/misc/vim-plugins/**/*
136+
137+
"6.topic: xfce":
138+
- nixos/doc/manual/configuration/xfce.xml
139+
- nixos/modules/services/x11/desktop-managers/xfce.nix
140+
- nixos/tests/xfce.nix
141+
- pkgs/desktops/xfce/**/*
142+
143+
"8.has: changelog":
144+
- nixos/doc/manual/release-notes/**/*
145+
146+
"8.has: documentation":
147+
- doc/**/*
148+
- nixos/doc/**/*
149+
150+
"8.has: module (update)":
151+
- nixos/modules/**/*

‎.github/workflows/direct-push.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: "Direct Push Warning"
2+
on:
3+
push:
4+
branches:
5+
- master
6+
- release-**
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
if: github.repository_owner == 'NixOS'
11+
env:
12+
GITHUB_SHA: ${{ github.sha }}
13+
GITHUB_REPOSITORY: ${{ github.repository }}
14+
steps:
15+
- name: Check if commit is a merge commit
16+
id: ismerge
17+
run: |
18+
ISMERGE=$(curl -H 'Accept: application/vnd.github.groot-preview+json' -H "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/${{ env.GITHUB_REPOSITORY }}/commits/${{ env.GITHUB_SHA }}/pulls | jq -r '.[] | select(.merge_commit_sha == "${{ env.GITHUB_SHA }}") | any')
19+
echo "::set-output name=ismerge::$ISMERGE"
20+
- name: Warn if the commit was a direct push
21+
if: steps.ismerge.outputs.ismerge != 'true'
22+
uses: peter-evans/commit-comment@v1
23+
with:
24+
body: |
25+
@${{ github.actor }}, you pushed a commit directly to master/release branch
26+
instead of going through a Pull Request.
27+
28+
That's highly discouraged beyond the few exceptions listed
29+
on https://github.com/NixOS/nixpkgs/issues/118661

‎.github/workflows/editorconfig.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Fetch editorconfig-checker
2626
if: env.PR_DIFF
2727
env:
28-
ECC_VERSION: "2.3.1"
28+
ECC_VERSION: "2.3.5"
2929
ECC_URL: "https://github.com/editorconfig-checker/editorconfig-checker/releases/download"
3030
run: |
3131
curl -sSf -O -L -C - "$ECC_URL/$ECC_VERSION/ec-linux-amd64.tar.gz" && \

‎.github/workflows/labels.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: "Label PR"
2+
3+
on:
4+
pull_request_target:
5+
types: [edited, opened, synchronize, reopened]
6+
7+
permissions:
8+
contents: read
9+
pull-requests: write
10+
11+
jobs:
12+
labels:
13+
runs-on: ubuntu-latest
14+
if: github.repository_owner == 'NixOS'
15+
steps:
16+
- uses: actions/labeler@v3
17+
with:
18+
repo-token: ${{ secrets.GITHUB_TOKEN }}
19+
sync-labels: true

‎.github/workflows/manual-nixos.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: "Build NixOS manual"
22

3+
permissions: read-all
4+
35
on:
46
pull_request_target:
57
branches:
@@ -15,11 +17,11 @@ jobs:
1517
with:
1618
# pull_request_target checks out the base branch by default
1719
ref: refs/pull/${{ github.event.pull_request.number }}/merge
18-
- uses: cachix/install-nix-action@v12
20+
- uses: cachix/install-nix-action@v13
1921
with:
2022
# explicitly enable sandbox
2123
extra_nix_config: sandbox = true
22-
- uses: cachix/cachix-action@v8
24+
- uses: cachix/cachix-action@v9
2325
with:
2426
# This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere.
2527
name: nixpkgs-ci

‎.github/workflows/manual-nixpkgs.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: "Build Nixpkgs manual"
22

3+
permissions: read-all
4+
35
on:
46
pull_request_target:
57
branches:
@@ -15,11 +17,11 @@ jobs:
1517
with:
1618
# pull_request_target checks out the base branch by default
1719
ref: refs/pull/${{ github.event.pull_request.number }}/merge
18-
- uses: cachix/install-nix-action@v12
20+
- uses: cachix/install-nix-action@v13
1921
with:
2022
# explicitly enable sandbox
2123
extra_nix_config: sandbox = true
22-
- uses: cachix/cachix-action@v8
24+
- uses: cachix/cachix-action@v9
2325
with:
2426
# This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere.
2527
name: nixpkgs-ci

‎.github/workflows/rebase-staging.yml‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)