Unverified Commit 3a826649 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into haskell-updates

parents ef3f2487 4765af76

.git-blame-ignore-revs

+14 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3 
# fix indentation in meteor default.nix

a37a6de881ec4c6708e6b88fd16256bbc7f26bbd



# pkgs/stdenv/make-derivation: Reindent

b4cc2a2479a7ab0f6440b2e1319221920ef72699



# treewide: automatically md-convert option descriptions

2e751c0772b9d48ff6923569adfa661b030ab6a2
@@ -189,3 +192,14 @@ ce21e97a1f20dee15da85c084f9d1148d84f853b 


# percona: apply nixfmt

8d14fa2886fec877690c6d28cfcdba4503dbbcea



# nixos/virtualisation: format image-related files

# Original formatting commit that was reverted

04fadac429ca7d6b92025188652376c230205730

# Revert commit

4cec81a9959ce612b653860dcca53101a36f328a

# Final commit that does the formatting

88b285c01d84de82c0b2b052fd28eaf6709c2d26



# sqlc: format with nixfmt

2bdec131b2bb2c8563f4556d741d34ccb77409e2

.github/ISSUE_TEMPLATE.md

+1 −1
Original line number Diff line number Diff line
@@ -8,4 +8,4 @@ 


## Technical details



Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.
 
<!-- Please insert the output of running `nix-shell -p nix-info --run "nix-info -m"` below this line -->

.github/ISSUE_TEMPLATE/bug_report.md

+1 −5
Original line number Diff line number Diff line
@@ -33,12 +33,8 @@ 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

```

<!-- Please insert the output of running `nix-shell -p nix-info --run "nix-info -m"` below this line -->



---

.github/ISSUE_TEMPLATE/build_failure.md

+1 −6
Original line number Diff line number Diff line
@@ -31,12 +31,7 @@ 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

```

<!-- Please insert the output of running `nix-shell -p nix-info --run "nix-info -m"` below this line -->



---

.github/labeler.yml

+12 −3
Original line number Diff line number Diff line
@@ -217,9 +217,9 @@ 
    - changed-files:

      - any-glob-to-any-file:

        - doc/languages-frameworks/nim.section.md

        - pkgs/development/compilers/nim/*

        - pkgs/development/nim-packages/**/*

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

        - pkgs/build-support/build-nim-package.nix

        - pkgs/by-name/ni/nim*

        - pkgs/top-level/nim-overrides.nix



"6.topic: nodejs":

  - any:
@@ -340,6 +340,15 @@ 
        - pkgs/os-specific/linux/systemd/**/*

        - nixos/modules/system/boot/systemd*/**/*



"6.topic: tcl":

  - any:

    - changed-files:

      - any-glob-to-any-file:

        - doc/languages-frameworks/tcl.section.md

        - pkgs/development/interpreters/tcl/*

        - pkgs/development/tcl-modules/**/*

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



"6.topic: TeX":

  - any:

    - changed-files: