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

Merge master into haskell-updates

parents 5f961513 9e273e5e

.github/labeler.yml

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ 
    - changed-files:

      - any-glob-to-any-file:

        - nixos/**/*

        - pkgs/by-name/sw/switch-to-configuration-ng/**/*

        - pkgs/os-specific/linux/nixos-rebuild/**/*



"6.topic: nim":

ci/OWNERS

+6 −3
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
/.github/workflows/check-nix-format.yml @infinisil

/.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron

/.github/workflows/codeowners-v2.yml @infinisil

/ci/OWNERS @infinisil

/ci @infinisil @philiptaron @NixOS/Security

/ci/OWNERS @infinisil @philiptaron



# Development support

/.editorconfig @Mic92 @zowoq
@@ -296,10 +296,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/pkgs/applications/editors/kakoune     @philiptaron



# Neovim

/pkgs/applications/editors/neovim      @figsoda @teto

/pkgs/applications/editors/neovim      @NixOS/neovim



# VimPlugins

/pkgs/applications/editors/vim/plugins         @figsoda

/pkgs/applications/editors/vim/plugins         @NixOS/neovim



# VsCode Extensions

/pkgs/applications/editors/vscode/extensions
@@ -338,6 +338,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/pkgs/by-name/ne/nemo          @mkg20001

/pkgs/by-name/ne/nemo-*        @mkg20001



# Xfce

/doc/hooks/xfce4-dev-tools.section.md @NixOS/xfce



# nim

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

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

doc/hooks/index.md

+1 −0
Original line number Diff line number Diff line
@@ -39,4 +39,5 @@ versionCheckHook.section.md 
waf.section.md

zig.section.md

xcbuild.section.md

xfce4-dev-tools.section.md

```

doc/hooks/xfce4-dev-tools.section.md

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# `xfce.xfce4-dev-tools` {#xfce4-dev-tools}



This setup hook attempts to run `xdt-autogen` in `xdtAutogenPhase`, which is part of `preConfigurePhases`.



[]{#dontUseXdtAutogenPhase} This behavior can be disabled by setting `dontUseXdtAutogenPhase` to `true`.

doc/languages-frameworks/haskell.section.md

+4 −0
Original line number Diff line number Diff line
@@ -191,6 +191,10 @@ and `version` from Hackage. 
`sha256`

: Hash to use for the default case of `src`.



`sourceRoot`, `setSourceRoot`

: Passed to `stdenv.mkDerivation`; see [“Variables controlling the unpack

phase”](#variables-controlling-the-unpack-phase).



`revision`

: Revision number of the updated cabal file to fetch from Hackage.

If `null` (which is the default value), the one included in `src` is used.