Unverified Commit 5166743e authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents b83d25ab f83bf518

maintainers/maintainer-list.nix

+18 −11
Original line number Diff line number Diff line
@@ -606,17 +606,6 @@ 
    githubId = 50264672;

    name = "Adam Freeth";

  };

  adamperkowski = {

    name = "Adam Perkowski";

    email = "me@adamperkowski.dev";

    matrix = "@adam:matrix.system72.dev";

    github = "koibtw";

    githubId = 75480869;

    keys = [

      { fingerprint = "00F6 1623 FB56 BC5B B709  4E63 4CE6 C117 2DF6 BE79"; }

      { fingerprint = "5A53 0832 DA91 20B0 CA57  DDB6 7CBD B58E CF1D 3478"; }

    ];

  };

  adamt = {

    email = "mail@adamtulinius.dk";

    github = "adamtulinius";
@@ -11631,6 +11620,13 @@ 
    githubId = 49811314;

    keys = [ { fingerprint = "CC36 4CF4 32DD 443F 27FC  033C 3475 AA20 D72F 6A93"; } ];

  };

  jaanonim = {

    name = "Jaanonim";

    email = "mat8mro@gmail.com";

    github = "jaanonim";

    githubId = 28810058;

    keys = [ { fingerprint = "5C4A 273F 5F11 3DF7 ECDF  0AD7 933A F32D 3ABD 5CAF"; } ];

  };

  jab = {

    name = "Joshua Bronson";

    email = "jabronson@gmail.com";
@@ -14032,6 +14028,17 @@ 
    githubId = 67888720;

    name = "Kira";

  };

  koi = {

    name = "koi";

    email = "me@koi.rip";

    matrix = "@koi:system72.dev";

    github = "koibtw";

    githubId = 75480869;

    keys = [

      { fingerprint = "00F6 1623 FB56 BC5B B709  4E63 4CE6 C117 2DF6 BE79"; }

      { fingerprint = "5A53 0832 DA91 20B0 CA57  DDB6 7CBD B58E CF1D 3478"; }

    ];

  };

  kolaente = {

    email = "k@knt.li";

    github = "kolaente";

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

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ In addition to numerous new and updated packages, this release has the following 


- [blesh](https://github.com/akinomyoga/ble.sh), a line editor written in pure bash. Available as [programs.bash.blesh](#opt-programs.bash.blesh.enable).



- [Budgie Desktop](https://github.com/BuddiesOfBudgie/budgie-desktop), a familiar, modern desktop environment. Available as [services.xserver.desktopManager.budgie](options.html#opt-services.xserver.desktopManager.budgie).

- [Budgie Desktop](https://github.com/BuddiesOfBudgie/budgie-desktop), a familiar, modern desktop environment. Available as `services.xserver.desktopManager.budgie`.



- [clash-verge](https://github.com/zzzgydi/clash-verge), a Clash GUI based on tauri. Available as [programs.clash-verge](#opt-programs.clash-verge.enable).

nixos/modules/programs/nvrs.nix

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ let 
  settingsFormat = pkgs.formats.toml { };

in

{

  meta.maintainers = with lib.maintainers; [ adamperkowski ];

  meta.maintainers = with lib.maintainers; [ koi ];



  options.programs.nvrs = {

    enable = lib.mkEnableOption "nvrs";

nixos/modules/services/databases/victoriatraces.nix

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ in 
        SystemCallFilter = [

          "@system-service"

          "~@privileged"

          "mincore"

        ];

      };

nixos/modules/services/x11/desktop-managers/budgie.nix→nixos/modules/services/desktop-managers/budgie.nix

+10 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ let 
    types

    ;



  cfg = config.services.xserver.desktopManager.budgie;

  cfg = config.services.desktopManager.budgie;



  nixos-background-light = pkgs.nixos-artwork.wallpapers.nineish;

  nixos-background-dark = pkgs.nixos-artwork.wallpapers.nineish-dark-gray;
@@ -63,8 +63,15 @@ in 
{

  meta.maintainers = lib.teams.budgie.members;



  imports = [

    (lib.mkRenamedOptionModule

      [ "services" "xserver" "desktopManager" "budgie" ]

      [ "services" "desktopManager" "budgie" ]

    )

  ];



  options = {

    services.xserver.desktopManager.budgie = {

    services.desktopManager.budgie = {

      enable = mkEnableOption "the Budgie desktop";



      sessionPath = mkOption {
@@ -128,7 +135,7 @@ in 
      };

    };



    services.xserver.desktopManager.budgie.sessionPath = [ pkgs.budgie-desktop-view ];

    services.desktopManager.budgie.sessionPath = [ pkgs.budgie-desktop-view ];



    environment.extraInit = ''

      ${concatMapStrings (p: ''