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

Merge master into haskell-updates

parents 5e9077b4 bca7aaf8

doc/contributing/coding-conventions.chapter.md

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ In the file `pkgs/top-level/all-packages.nix` you can find fetch helpers, these 
    owner = "NixOS";

    repo = "nix";

    rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";

    hash = "ha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ=;

    hash = "ha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ=";

  }

  ```

maintainers/maintainer-list.nix

+28 −0
Original line number Diff line number Diff line
@@ -1341,6 +1341,12 @@ 
    githubId = 84152630;

    name = "Ashley Chiara";

  };

  ashleyghooper = {

    email = "ashleyghooper@gmail.com";

    github = "ashleyghooper";

    githubId = 11037075;

    name = "Ashley Hooper";

  };

  aske = {

    email = "aske@fmap.me";

    github = "aske";
@@ -4065,6 +4071,15 @@ 
    githubId = 108501;

    name = "David Pflug";

  };

  dr460nf1r3 = {

    email = "root@dr460nf1r3.org";

    github = "dr460nf1r3";

    githubId = 12834713;

    name = "Nico Jensch";

    keys = [{

      fingerprint = "D245 D484 F357 8CB1 7FD6  DA6B 67DB 29BF F3C9 6757";

    }];

  };

  dramaturg = {

    email = "seb@ds.ag";

    github = "dramaturg";
@@ -4990,6 +5005,13 @@ 
    keys = [{ fingerprint = "7391 BF2D A2C3 B2C9 BE25  ACA9 C7A7 4616 F302 5DF4"; }];

    matrix = "@felipeqq2:pub.solar";

  };

  felixalbrigtsen = {

    email = "felixalbrigtsen@gmail.com";

    github = "felixalbrigtsen";

    githubId = 64613093;

    name = "Felix Albrigtsen";

    matrix = "@felixalb:pvv.ntnu.no";

  };

  felixscheinost = {

    name = "Felix Scheinost";

    email = "felix.scheinost@posteo.de";
@@ -7881,6 +7903,12 @@ 
    githubId = 1047859;

    name = "Kaz Wesley";

  };

  kazenyuk = {

    email = "kazenyuk@pm.me";

    github = "nvmd";

    githubId = 524492;

    name = "Sergey Kazenyuk";

  };

  kcalvinalvin = {

    email = "calvin@kcalvinalvin.info";

    github = "kcalvinalvin";

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

+6 −0
Original line number Diff line number Diff line
@@ -264,6 +264,12 @@ In addition to numerous new and upgraded packages, this release has the followin 


- `services.borgmatic` now allows for multiple configurations, placed in `/etc/borgmatic.d/`, you can define them with `services.borgmatic.configurations`.



- `service.openafsServer` features a new backup server `pkgs.fabs` as a

  replacement for openafs's own `buserver`. See

  [FABS](https://github.com/openafs-contrib/fabs) to check if this is an viable

  replacement. It stores backups as volume dump files and thus better integrates

  into contemporary backup solutions.



- The `dnsmasq` service now takes configuration via the

  `services.dnsmasq.settings` attribute set. The option

  `services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches

nixos/modules/misc/ids.nix

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ in 
      # nix-serve = 199; # unused, removed 2020-12-12

      #tvheadend = 200; # dynamically allocated as of 2021-09-18

      uwsgi = 201;

      gitit = 202;

      # gitit = 202; # unused, module was removed 2023-04-03

      riemanntools = 203;

      subsonic = 204;

      # riak = 205; # unused, remove 2022-07-22

nixos/modules/module-list.nix

+0 −1
Original line number Diff line number Diff line
@@ -615,7 +615,6 @@ 
  ./services/misc/gammu-smsd.nix

  ./services/misc/geoipupdate.nix

  ./services/misc/gitea.nix

  # ./services/misc/gitit.nix

  ./services/misc/gitlab.nix

  ./services/misc/gitolite.nix

  ./services/misc/gitweb.nix