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

Merge master into haskell-updates

parents 57af37a3 6cf39479

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ Christina Sørensen <christina@cafkafk.com> <christinaafk@gmail.com> 
Christina Sørensen <christina@cafkafk.com> <89321978+cafkafk@users.noreply.github.com>

Daniel Løvbrøtte Olsen <me@dandellion.xyz> <daniel.olsen99@gmail.com>

Fabian Affolter <mail@fabian-affolter.ch> <fabian@affolter-engineering.ch>

Fiona Behrens <me@kloenk.dev>

Fiona Behrens <me@kloenk.dev> <me@kloenk.de>

goatastronaut0212 <goatastronaut0212@outlook.com> <goatastronaut0212@proton.me>

Janne Heß <janne@hess.ooo> <dasJ@users.noreply.github.com>

Jörg Thalheim <joerg@thalheim.io> <Mic92@users.noreply.github.com>

CONTRIBUTING.md

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ Container system, boot system and library changes are some examples of the pull 


To streamline automated updates, leverage the nixpkgs-merge-bot by simply commenting `@NixOS/nixpkgs-merge-bot merge`. The bot will verify if the following conditions are met, refusing to merge otherwise:



- the PR author should be @r-ryantm;

- the commenter that issued the command should be among the package maintainers;

- the package should reside in `pkgs/by-name`.

ci/OWNERS

+4 −4
Original line number Diff line number Diff line
@@ -226,10 +226,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel



# PostgreSQL and related stuff

/pkgs/servers/sql/postgresql @thoughtpolice

/nixos/modules/services/databases/postgresql.md @thoughtpolice

/nixos/modules/services/databases/postgresql.nix @thoughtpolice

/nixos/tests/postgresql.nix @thoughtpolice

/pkgs/servers/sql/postgresql @NixOS/postgres

/nixos/modules/services/databases/postgresql.md @NixOS/postgres

/nixos/modules/services/databases/postgresql.nix @NixOS/postgres

/nixos/tests/postgresql.nix @NixOS/postgres



# Hardened profile & related modules

/nixos/modules/profiles/hardened.nix @joachifm

lib/licenses.nix

+5 −0
Original line number Diff line number Diff line
@@ -1212,6 +1212,11 @@ lib.mapAttrs mkLicense ({ 
    fullName = "TCL/TK License";

  };



  tost = {

    fullName = "Tomorrow Open Source Technology License 1.0";

    url = "https://github.com/PixarAnimationStudios/OpenUSD/blob/release/LICENSE.txt";

  };



  ucd = {

    fullName = "Unicode Character Database License";

    url = "https://fedoraproject.org/wiki/Licensing:UCD";

maintainers/maintainer-list.nix

+18 −11
Original line number Diff line number Diff line
@@ -4394,7 +4394,7 @@ 
    githubId = 2083950;

  };

  conni2461 = {

    email = "simon.hauser@outlook.com";

    email = "simon-hauser@outlook.com";

    github = "Conni2461";

    name = "Simon Hauser";

    githubId = 15233006;
@@ -8674,6 +8674,12 @@ 
    githubId = 186660;

    name = "Miao, ZhiCheng";

  };

  helsinki-Jo = {

    email = "joachim.ernst@helsinki-systems.de";

    github = "helsinki-Jo";

    githubId = 155722885;

    name = "Joachim Ernst";

  };

  henkery = {

    email = "jim@reupload.nl";

    github = "henkery";
@@ -9740,6 +9746,13 @@ 
    githubId = 2179419;

    name = "Arseniy Seroka";

  };

  jakecleary = {

    email = "shout@jakecleary.net";

    github = "jakecleary";

    githubId = 4572429;

    name = "Jake Cleary";

    keys = [ { fingerprint = "6192 E5CC 28B8 FA7E F5F3  775F 3726 5B1E 496C 92A2"; } ];

  };

  jakedevs = {

    email = "work@jakedevs.net";

    github = "jakedevs";
@@ -11561,11 +11574,11 @@ 
  };

  kloenk = {

    email = "me@kloenk.dev";

    matrix = "@kloenk:petabyte.dev";

    name = "Finn Behrens";

    github = "Kloenk";

    matrix = "@kloenk:kloenk.eu";

    name = "Fiona Behrens";

    github = "kloenk";

    githubId = 12898828;

    keys = [ { fingerprint = "6881 5A95 D715 D429 659B  48A4 B924 45CF C954 6F9D"; } ];

    keys = [ { fingerprint = "B44A DFDF F869 A66A 3FDF  DD8B 8609 A7B5 19E5 E342"; } ];

  };

  kmcopper = {

    email = "kmcopper@danwin1210.me";
@@ -13738,12 +13751,6 @@ 
    githubId = 2971615;

    name = "Marius Bergmann";

  };

  mcaju = {

    email = "cajum.bugs@yandex.com";

    github = "CajuM";

    githubId = 10420834;

    name = "Mihai-Drosi Caju";

  };

  mccartykim = {

    email = "mccartykim@zoho.com";

    github = "mccartykim";