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

Merge master into haskell-updates

parents 041376b9 28eb9362

.github/CODEOWNERS

+4 −4
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ 
# Libraries

/lib                        @edolstra @infinisil

/lib/systems                @alyssais @ericson2314 @amjoseph-nixpkgs

/lib/generators.nix         @edolstra @Profpatsch

/lib/cli.nix                @edolstra @Profpatsch

/lib/debug.nix              @edolstra @Profpatsch

/lib/asserts.nix            @edolstra @Profpatsch

/lib/generators.nix         @infinisil @edolstra @Profpatsch

/lib/cli.nix                @infinisil @edolstra @Profpatsch

/lib/debug.nix              @infinisil @edolstra @Profpatsch

/lib/asserts.nix            @infinisil @edolstra @Profpatsch

/lib/path.*                 @infinisil @fricklerhandwerk

/lib/fileset                @infinisil

/doc/functions/fileset.section.md @infinisil

.github/PULL_REQUEST_TEMPLATE.md

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ For new packages please briefly describe the package or provide a link to its ho 
  - [ ] aarch64-linux

  - [ ] x86_64-darwin

  - [ ] aarch64-darwin

- [ ] For non-Linux: Is `sandbox = true` set in `nix.conf`? (See [Nix manual](https://nixos.org/manual/nix/stable/command-ref/conf-file.html))

- For non-Linux: Is sandboxing enabled in `nix.conf`? (See [Nix manual](https://nixos.org/manual/nix/stable/command-ref/conf-file.html))

  - [ ] `sandbox = relaxed`

  - [ ] `sandbox = true`

- [ ] Tested, as applicable:

  - [NixOS test(s)](https://nixos.org/manual/nixos/unstable/index.html#sec-nixos-tests) (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))

  - and/or [package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests)

maintainers/maintainer-list.nix

+20 −6
Original line number Diff line number Diff line
@@ -2608,12 +2608,6 @@ 
    githubId = 200617;

    name = "Ben Sima";

  };

  bstrik = {

    email = "dutchman55@gmx.com";

    github = "bstrik";

    githubId = 7716744;

    name = "Berno Strik";

  };

  btlvr = {

    email = "btlvr@protonmail.com";

    github = "btlvr";
@@ -3886,6 +3880,13 @@ 
    githubId = 107034852;

    name = "Daniyal Suri";

  };

  dannixon = {

    email = "dan@dan-nixon.com";

    github = "DanNixon";

    githubId = 4037377;

    name = "Dan Nixon";

    matrix = "@dannixon:matrix.org";

  };

  dansbandit = {

    github = "dansbandit";

    githubId = 4530687;
@@ -11666,6 +11667,13 @@ 
    githubId = 149558;

    name = "Merlin Gaillard";

  };

  mirkolenz = {

    name = "Mirko Lenz";

    email = "mirko@mirkolenz.com";

    matrix = "@mlenz:matrix.org";

    github = "mirkolenz";

    githubId = 5160954;

  };

  mirrexagon = {

    email = "mirrexagon@mirrexagon.com";

    github = "mirrexagon";
@@ -15042,6 +15050,12 @@ 
    githubId = 496447;

    name = "Robert Hensing";

  };

  robert-manchester = {

    email = "robert.manchester@gmail.com";

    github = "robert-manchester";

    githubId = 86313040;

    name = "Robert Manchester";

  };

  robertodr = {

    email = "roberto.diremigio@gmail.com";

    github = "robertodr";

maintainers/scripts/pluginupdate.py

+4 −1
Original line number Diff line number Diff line
@@ -786,8 +786,11 @@ def update_plugins(editor: Editor, args): 
    autocommit = not args.no_commit



    if autocommit:

        from datetime import date

        editor.nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True)

        commit(editor.nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile])

        updated = date.today().strftime('%m-%d-%Y')



        commit(editor.nixpkgs_repo, f"{editor.attr_path}: updated the {updated}", [args.outfile])



    if redirects:

        update()

nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ of actions is always the same: 
- Inspect what changed during these actions and print units that failed and

  that were newly started



By default, some units are filtered from the outputs to make it less spammy.

This can be disabled for development or testing by setting the environment variable

`STC_DISPLAY_ALL_UNITS=1`



Most of these actions are either self-explaining but some of them have to do

with our units or the activation script. For this reason, these topics are

explained in the next sections.