forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into networkd-containers
Conflicts:
nixos/modules/system/activation/switch-to-configuration.pl
nixos/modules/system/boot/systemd/nspawn.nix
Note: some fixes are rather dirty, but right now I'd mainly like to get
the branch up-to-date to upgrade the systems where I use this to 22.05.- Loading branch information
Showing
15,308 changed files
with
554,318 additions
and
398,676 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| # This file contains a list of commits that are not likely what you | ||
| # are looking for in a blame, such as mass reformatting or renaming. | ||
| # You can set this file as a default ignore file for blame by running | ||
| # the following command. | ||
| # | ||
| # $ git config blame.ignoreRevsFile .git-blame-ignore-revs | ||
| # | ||
| # To temporarily not use this file add | ||
| # --ignore-revs-file="" | ||
| # to your blame command. | ||
| # | ||
| # The ignoreRevsFile can't be set globally due to blame failing if the file isn't present. | ||
| # To not have to set the option in every repository it is needed in, | ||
| # save the following script in your path with the name "git-bblame" | ||
| # now you can run | ||
| # $ git bblame $FILE | ||
| # to use the .git-blame-ignore-revs file if it is present. | ||
| # | ||
| # #!/usr/bin/env bash | ||
| # repo_root=$(git rev-parse --show-toplevel) | ||
| # if [[ -e $repo_root/.git-blame-ignore-revs ]]; then | ||
| # git blame --ignore-revs-file="$repo_root/.git-blame-ignore-revs" $@ | ||
| # else | ||
| # git blame $@ | ||
| # fi | ||
|
|
||
|
|
||
| # nixos/modules/rename: Sort alphabetically | ||
| 1f71224fe86605ef4cd23ed327b3da7882dad382 | ||
|
|
||
| # nixos: fix module paths in rename.nix | ||
| d08ede042b74b8199dc748323768227b88efcf7c | ||
|
|
||
| # fix indentation in mk-python-derivation.nix | ||
| d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| --- | ||
| name: Build failure | ||
| about: Create a report to help us improve | ||
| title: '' | ||
| labels: '0.kind: build failure' | ||
| assignees: '' | ||
|
|
||
| --- | ||
|
|
||
| ### Steps To Reproduce | ||
| Steps to reproduce the behavior: | ||
| 1. build *X* | ||
|
|
||
| ### Build log | ||
| ``` | ||
| log here if short otherwise a link to a gist | ||
| ``` | ||
|
|
||
| ### Additional context | ||
| Add any other context about the problem here. | ||
|
|
||
| ### Notify maintainers | ||
| <!-- | ||
| Please @ people who are in the `meta.maintainers` list of the offending package or module. | ||
| If in doubt, check `git blame` for whoever last touched something. | ||
| --> | ||
|
|
||
| ### Metadata | ||
| Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result. | ||
|
|
||
| ```console | ||
| [user@system:~]$ nix-shell -p nix-info --run "nix-info -m" | ||
| output here | ||
| ``` |
Oops, something went wrong.