Skip to content

Commit 60785f9

Browse files
committed
Merge branch 'master' into log-ifd
2 parents b919084 + 006291e commit 60785f9

File tree

492 files changed

+15163
-6642
lines changed

Some content is hidden

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

492 files changed

+15163
-6642
lines changed

.github/CODEOWNERS

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Pull requests concerning the listed files will automatically invite the respective maintainers as reviewers.
2+
# This file is not used for denoting any kind of ownership, but is merely a tool for handling notifications.
3+
#
4+
# Merge permissions are required for maintaining an entry in this file.
5+
# For documentation on this mechanism, see https://help.github.com/articles/about-codeowners/
6+
7+
# Default reviewers if nothing else matches
8+
* @edolstra
9+
10+
# This file
11+
.github/CODEOWNERS @edolstra
12+
13+
# Public documentation
14+
/doc @fricklerhandwerk
15+
*.md @fricklerhandwerk
16+
17+
# Libstore layer
18+
/src/libstore @thufschmitt

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@ A clear and concise description of what you expected to happen.
3030
**Additional context**
3131

3232
Add any other context about the problem here.
33+
34+
**Priorities**
35+
36+
Add :+1: to [issues you find important](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc).

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ A clear and concise description of any alternative solutions or features you've
1818

1919
**Additional context**
2020
Add any other context or screenshots about the feature request here.
21+
22+
**Priorities**
23+
24+
Add :+1: to [issues you find important](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc).
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
name: Installer issue
3+
about: Report problems with installation
4+
title: ''
5+
labels: installer
6+
assignees: ''
7+
8+
---
9+
10+
## Platform
11+
12+
<!-- select the platform on which you tried to install Nix -->
13+
14+
- [ ] Linux: <!-- state your distribution, e.g. Arch Linux, Ubuntu, ... -->
15+
- [ ] macOS
16+
- [ ] WSL
17+
18+
## Additional information
19+
20+
<!-- state special circumstances on your system or additional steps you have taken prior to installation -->
21+
22+
## Output
23+
24+
<details><summary>Output</summary>
25+
26+
```log
27+
28+
<!-- paste console output here and remove this comment -->
29+
30+
```
31+
32+
</details>
33+
34+
## Priorities
35+
36+
Add :+1: to [issues you find important](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc).

.github/ISSUE_TEMPLATE/missing_documentation.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,6 @@ assignees: ''
2626

2727
<!-- propose a solution -->
2828

29+
## Priorities
30+
31+
Add :+1: to [issues you find important](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc).

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Motivation
2+
<!-- Briefly explain what the change is about and why it is desirable. -->
3+
4+
# Context
5+
<!-- Provide context. Reference open issues if available. -->
6+
7+
<!-- Non-trivial change: Briefly outline the implementation strategy. -->
8+
9+
<!-- Invasive change: Discuss alternative designs or approaches you considered. -->
10+
11+
<!-- Large change: Provide instructions to reviewers how to read the diff. -->
12+
13+
# Checklist for maintainers
14+
15+
<!-- Contributors: please leave this as is -->
16+
17+
Maintainers: tick if completed or explain if not relevant
18+
19+
- [ ] agreed on idea
20+
- [ ] agreed on implementation strategy
21+
- [ ] tests, as appropriate
22+
- functional tests - `tests/**.sh`
23+
- unit tests - `src/*/tests`
24+
- integration tests - `tests/nixos/*`
25+
- [ ] documentation in the manual
26+
- [ ] code and comments are self-explanatory
27+
- [ ] commit message explains why the change was made
28+
- [ ] new feature or incompatible change: updated release notes
29+
30+
# Priorities
31+
32+
Add :+1: to [pull requests you find important](https://github.com/NixOS/nix/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc).

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

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

.github/labeler.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"documentation":
2+
- doc/manual/*
3+
- src/nix/**/*.md
4+
5+
"tests":
6+
- tests/**/*

.github/workflows/backport.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ jobs:
2121
fetch-depth: 0
2222
- name: Create backport PRs
2323
# should be kept in sync with `version`
24-
uses: zeebe-io/backport-action@v0.0.8
24+
uses: zeebe-io/backport-action@v1.2.0
2525
with:
2626
# Config README: https://github.com/zeebe-io/backport-action#backport-action
2727
github_token: ${{ secrets.GITHUB_TOKEN }}
2828
github_workspace: ${{ github.workspace }}
2929
pull_description: |-
30-
Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}.
30+
Automatic backport to `${target_branch}`, triggered by a label in #${pull_number}.
3131
# should be kept in sync with `uses`
3232
version: v0.0.5

.github/workflows/ci.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
- uses: actions/checkout@v3
2020
with:
2121
fetch-depth: 0
22-
- uses: cachix/install-nix-action@v17
22+
- uses: cachix/install-nix-action@v20
2323
- run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
24-
- uses: cachix/cachix-action@v10
24+
- uses: cachix/cachix-action@v12
2525
if: needs.check_secrets.outputs.cachix == 'true'
2626
with:
2727
name: '${{ env.CACHIX_NAME }}'
@@ -58,8 +58,10 @@ jobs:
5858
with:
5959
fetch-depth: 0
6060
- run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
61-
- uses: cachix/install-nix-action@v17
62-
- uses: cachix/cachix-action@v10
61+
- uses: cachix/install-nix-action@v19
62+
with:
63+
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
64+
- uses: cachix/cachix-action@v12
6365
with:
6466
name: '${{ env.CACHIX_NAME }}'
6567
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
@@ -77,7 +79,7 @@ jobs:
7779
steps:
7880
- uses: actions/checkout@v3
7981
- run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
80-
- uses: cachix/install-nix-action@v17
82+
- uses: cachix/install-nix-action@v19
8183
with:
8284
install_url: '${{needs.installer.outputs.installerURL}}'
8385
install_options: "--tarball-url-prefix https://${{ env.CACHIX_NAME }}.cachix.org/serve"
@@ -102,10 +104,12 @@ jobs:
102104
- uses: actions/checkout@v3
103105
with:
104106
fetch-depth: 0
105-
- uses: cachix/install-nix-action@v17
107+
- uses: cachix/install-nix-action@v19
108+
with:
109+
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
106110
- run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
107111
- run: echo NIX_VERSION="$(nix --experimental-features 'nix-command flakes' eval .\#default.version | tr -d \")" >> $GITHUB_ENV
108-
- uses: cachix/cachix-action@v10
112+
- uses: cachix/cachix-action@v12
109113
if: needs.check_secrets.outputs.cachix == 'true'
110114
with:
111115
name: '${{ env.CACHIX_NAME }}'

0 commit comments

Comments
 (0)