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

Merge staging-next into staging

parents cad1b252 3342d1a9

.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

maintainers/maintainer-list.nix

+13 −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;
@@ -14804,6 +14805,12 @@ 
    githubId = 165283;

    name = "Alexey Kutepov";

  };

  rexxDigital = {

    email = "joellarssonpriv@gmail.com";

    github = "rexxDigital";

    githubId = 44014925;

    name = "Rexx Larsson";

  };

  rgnns = {

    email = "jglievano@gmail.com";

    github = "rgnns";

maintainers/team-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -612,6 +612,7 @@ with lib.maintainers; { 


  minimal-bootstrap = {

    members = [

      alejandrosame

      artturin

      emilytrau

      ericson2314

nixos/doc/manual/development/activation-script.section.md

+1 −1
Original line number Diff line number Diff line
@@ -69,4 +69,4 @@ do: 
  `/etc/group` and `/etc/shadow`. This also creates home directories

- `usrbinenv` creates `/usr/bin/env`

- `var` creates some directories in `/var` that are not service-specific

- `wrappers` creates setuid wrappers like `ping` and `sudo`
 
- `wrappers` creates setuid wrappers like `sudo`

nixos/doc/manual/release-notes/rl-2311.section.md

+2 −0
Original line number Diff line number Diff line
@@ -347,6 +347,8 @@ 


- DocBook option documentation is no longer supported, all module documentation now uses markdown.



- `services.outline` can now be configured to use local filesystem storage instead of S3 storage using [services.outline.storage.storageType](#opt-services.outline.storage.storageType).



- `buildGoModule` `go-modules` attrs have been renamed to `goModules`.



- The `fonts.fonts` and `fonts.enableDefaultFonts` options have been renamed to `fonts.packages` and `fonts.enableDefaultPackages` respectively.