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

Merge master into staging-nixos

parents 95c8d1ec af1a49be

maintainers/maintainer-list.nix

+5 −0
Original line number Diff line number Diff line
@@ -11047,6 +11047,11 @@ 
    githubId = 207392575;

    name = "Isaac Kabel";

  };

  ikci = {

    github = "ikcii";

    githubId = 48479629;

    name = "ikci";

  };

  ikervagyok = {

    email = "ikervagyok@gmail.com";

    github = "ikervagyok";

maintainers/team-list.nix

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

  };



  cockpit = {

    members = [

      alexandru0-dev

      andre4ik3

      lucasew

    ];

    scope = "Maintain Cockpit and official plugins by the Cockpit project.";

    shortName = "Cockpit";

  };



  coq = {

    members = [

      cohencyril

nixos/modules/services/hardware/nvidia-container-toolkit/default.nix

+12 −1
Original line number Diff line number Diff line
@@ -151,6 +151,17 @@ 
    };



  config = lib.mkMerge [

    (lib.mkIf (config.virtualisation.docker.enableNvidia || config.virtualisation.podman.enableNvidia) {

      hardware.nvidia-container-toolkit.enable = lib.mkDefault true;



      warnings = lib.mkIf (!config.hardware.nvidia-container-toolkit.enable) [

        ''

          `virtualisation.docker.enableNvidia` or `virtualisation.podman.enableNvidia` is enabled,

          but `hardware.nvidia-container-toolkit.enable` is disabled. The nvidia-container-toolkit

          module is required for GPU support in containers.

        ''

      ];

    })

    (lib.mkIf config.virtualisation.docker.enableNvidia {

      environment.etc."nvidia-container-runtime/config.toml".text = ''

        disable-require = true
@@ -162,7 +173,7 @@ 
        no-cgroups = false

        path = "${lib.getExe' pkgs.libnvidia-container "nvidia-container-cli"}"

        [nvidia-container-runtime]

        mode = "auto"

        mode = "cdi"

        runtimes = ["docker-runc", "runc", "crun"]

        [nvidia-container-runtime-hook]

        path = "${lib.getOutput "tools" config.hardware.nvidia-container-toolkit.package}/bin/nvidia-container-runtime-hook"

nixos/modules/services/monitoring/cockpit.nix

+30 −14
Original line number Diff line number Diff line
@@ -15,6 +15,33 @@ let 
    mkPackageOption

    ;

  settingsFormat = pkgs.formats.ini { };



  pathPkgs = [ cfg.package ] ++ cfg.plugins;



  resourcesEnv = pkgs.buildEnv {

    name = "cockpit-plugins";

    paths = pathPkgs;

    pathsToLink = [ "/share/cockpit" ];

  };



  depsEnv = pkgs.buildEnv {

    name = "cockpit-plugins-env";

    paths = lib.concatMap (p: p.passthru.cockpitPath or [ ]) pathPkgs;

    pathsToLink = [

      "/bin"

      "/share"

      "/lib"

    ];

  };



  share = pkgs.buildEnv {

    name = "cockpit-share";

    paths = [

      resourcesEnv

      depsEnv

    ];

    pathsToLink = [ "/share" ];

  };

in

{

  options = {
@@ -100,22 +127,11 @@ in 
      };



      # Add plugins in discoverable folder

      "cockpit/share/cockpit".source = "${

        pkgs.buildEnv {

          name = "cockpit-plugins";

          paths = cfg.plugins ++ [ cfg.package ];

          pathsToLink = [ "/share/cockpit" ];

        }

      }/share/cockpit";

      "cockpit/share".source = "${share}/share";



      # Add plugins dependencies

      "cockpit/bin".source = "${

        pkgs.buildEnv {

          name = "cockpit-path";

          paths = lib.concatMap (p: p.passthru.cockpitPath or [ ]) cfg.plugins;

          pathsToLink = [ "/bin" ];

        }

      }/bin";

      "cockpit/bin".source = "${depsEnv}/bin";

      "cockpit/lib".source = "${depsEnv}/lib";

    };



    security.pam.services.cockpit = {

nixos/modules/services/system/automatic-timezoned.nix

+5 −3
Original line number Diff line number Diff line
@@ -57,13 +57,16 @@ in 
      automatic-timezoned = {

        description = "Automatically update system timezone based on location";

        requires = [ "automatic-timezoned-geoclue-agent.service" ];

        after = [ "automatic-timezoned-geoclue-agent.service" ];

        after = [

          "automatic-timezoned-geoclue-agent.service"

          "multi-user.target"

        ];

        serviceConfig = {

          Type = "exec";

          User = "automatic-timezoned";

          ExecStart = "${cfg.package}/bin/automatic-timezoned";

        };

        wantedBy = [ "default.target" ];

        wantedBy = [ "multi-user.target" ];

      };



      automatic-timezoned-geoclue-agent = {
@@ -77,7 +80,6 @@ in 
          Restart = "on-failure";

          PrivateTmp = true;

        };

        wantedBy = [ "default.target" ];

      };



    };