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

Merge master into staging-next

parents df35c8ee d7037fa4

.github/CODEOWNERS

+5 −0
Original line number Diff line number Diff line
@@ -196,6 +196,11 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/nixos/tests/kea.nix @mweinelt

/nixos/tests/knot.nix @mweinelt



# Web servers

/doc/builders/packages/nginx.section.md @raitobezarius

/pkgs/servers/http/nginx/ @raitobezarius

/nixos/modules/services/web-servers/nginx/ @raitobezarius



# Dhall

/pkgs/development/dhall-modules      @Gabriella439 @Profpatsch @ehmry

/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch @ehmry

lib/licenses.nix

+7 −0
Original line number Diff line number Diff line
@@ -657,6 +657,13 @@ in mkLicense lset) ({ 
    redistributable = true;

  };



  hl3 = {

    fullName = "Hippocratic License v3.0";

    url = "https://firstdonoharm.dev/version/3/0/core.txt";

    free = false;

    redistributable = true;

  };



  issl = {

    fullName = "Intel Simplified Software License";

    url = "https://software.intel.com/en-us/license/intel-simplified-software-license";

maintainers/maintainer-list.nix

+27 −0
Original line number Diff line number Diff line
@@ -1756,6 +1756,12 @@ 
      fingerprint = "6FBC A462 4EAF C69C A7C4  98C1 F044 3098 48A0 7CAC";

    }];

  };

  babeuh = {

    name = "Raphael Le Goaller";

    email = "babeuh@rlglr.fr";

    github = "babeuh";

    githubId = 60193302;

  };

  bachp = {

    email = "pascal.bach@nextrem.ch";

    matrix = "@bachp:matrix.org";
@@ -5807,6 +5813,11 @@ 
    githubId = 17859309;

    name = "Fuzen";

  };

  fwc = {

    github = "fwc";

    githubId = 29337229;

    name = "mtths";

  };

  fxfactorial = {

    email = "edgar.factorial@gmail.com";

    github = "fxfactorial";
@@ -9077,6 +9088,12 @@ 
    githubId = 5759930;

    name = "Alexis Destrez";

  };

  krupkat = {

    github = "krupkat";

    githubId = 6817216;

    name = "Tomas Krupka";

    matrix = "@krupkat:matrix.org";

  };

  ktf = {

    email = "giulio.eulisse@cern.ch";

    github = "ktf";
@@ -10036,6 +10053,16 @@ 
    githubId = 93990818;

    name = "Madoura";

  };

  maeve = {

    email = "mrey@mailbox.org";

    matrix = "@maeve:catgirl.cloud";

    github = "m-rey";

    githubId = 42996147;

    name = "Mæve";

    keys = [{

      fingerprint = "96C9 D086 CC9D 7BD7 EF24  80E2 9168 796A 1CC3 AEA2";

    }];

  };

  mafo = {

    email = "Marc.Fontaine@gmx.de";

    github = "MarcFontaine";

maintainers/team-list.nix

+1 −3
Original line number Diff line number Diff line
@@ -821,9 +821,7 @@ with lib.maintainers; { 
  };



  sphinx = {

    members = [

      SuperSandro2000

    ];

    members = [ ];

    scope = "Maintain Sphinx related packages.";

    shortName = "Sphinx";

  };

nixos/modules/installer/tools/tools.nix

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ in 
      # your system.  Help is available in the configuration.nix(5) man page

      # and in the NixOS manual (accessible by running `nixos-help`).



      { config, pkgs, ... }:

      { config, lib, pkgs, ... }:



      {

        imports =