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

Merge master into staging-next

parents abcc8690 e01f273d

maintainers/maintainer-list.nix

+0 −12
Original line number Diff line number Diff line
@@ -17630,12 +17630,6 @@ 
      }

    ];

  };

  mockersf = {

    email = "francois.mockers@vleue.com";

    github = "mockersf";

    githubId = 8672791;

    name = "François Mockers";

  };

  modderme123 = {

    email = "modderme123@gmail.com";

    github = "milomg";
@@ -19317,12 +19311,6 @@ 
    githubId = 1839979;

    name = "Niklas Thörne";

  };

  NthTensor = {

    email = "miles.silberlingcook@gmail.com";

    github = "NthTensor";

    githubId = 16138381;

    name = "Miles Silberling-Cook";

  };

  nudelsalat = {

    email = "nudelsalat@clouz.de";

    name = "Fabian Dreßler";

maintainers/team-list.nix

+0 −42
Original line number Diff line number Diff line
@@ -56,16 +56,6 @@ with lib.maintainers; 
    enableFeatureFreezePing = true;

  };



  apm = {

    scope = "Team for packages maintained by employees of Akademie für Pflegeberufe und Management GmbH.";

    shortName = "apm employees";

    # Edits to this list should only be done by an already existing member.

    members = [

      DutchGerman

      friedow

    ];

  };



  apparmor = {

    scope = "AppArmor-related modules, userspace tool packages and profiles";

    shortName = "apparmor";
@@ -96,16 +86,6 @@ with lib.maintainers; 
    enableFeatureFreezePing = true;

  };



  bitnomial = {

    # Verify additions to this team with at least one already existing member of the team.

    members = [

      cdepillabout

      wraithm

    ];

    scope = "Group registration for packages maintained by Bitnomial.";

    shortName = "Bitnomial employees";

  };



  blockchains = {

    members = [

      mmahut
@@ -143,17 +123,6 @@ with lib.maintainers; 
    enableFeatureFreezePing = true;

  };



  c3d2 = {

    members = [

      astro

      SuperSandro2000

      revol-xut

      oxapentane

    ];

    scope = "Maintain packages used in the C3D2 hackspace";

    shortName = "c3d2";

  };



  categorization = {

    github = "categorization";

  };
@@ -384,17 +353,6 @@ with lib.maintainers; 
    github = "freedesktop";

  };



  fslabs = {

    # Verify additions to this team with at least one already existing member of the team.

    members = [

      lpostula

      mockersf

      NthTensor

    ];

    scope = "Group registration for packages maintained by Foresight Spatial Labs.";

    shortName = "Foresight Spatial Labs employees";

  };



  gcc = {

    members = [

      synthetica

nixos/lib/test-script-prepend.py

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ from unittest import TestCase 




class RetryProtocol(Protocol):

    def __call__(self, fn: Callable, timeout: int = 900) -> None:

    def __call__(self, fn: Callable, timeout_seconds: int = 900) -> None:

        raise Exception("This is just type information for the Nix test driver")

nixos/modules/image/images.nix

+26 −18
Original line number Diff line number Diff line
@@ -81,8 +81,16 @@ in 
    };

  };



  config.image.modules = lib.mkIf (!config.system.build ? image) imageModules;

  config.system.build.images = lib.mkIf (!config.system.build ? image) (

  config.image.modules = imageModules;

  config.system.build.images =

    lib.warnIf (config.system.build ? image)

      ''

        `system.build.image` is defined, while `system.build.images` is used.

        The former will conflict with variants in the latter.

        Maybe you are importing an image-building module into the toplevel?

        Add it to `image.modules` instead, or adjust priorities manually.

      ''

      (

        lib.mapAttrs (

          name: nixos:

          let

nixos/modules/services/misc/portunus.nix

+1 −1
Original line number Diff line number Diff line
@@ -313,5 +313,5 @@ in 
    ];

  };



  meta.maintainers = [ lib.maintainers.majewsky ] ++ lib.teams.c3d2.members;

  meta.maintainers = pkgs.portunus.meta.maintainers;

}