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

Merge master into staging-next

parents 6232c591 27ccbffc

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -28704,6 +28704,12 @@ 
    githubId = 10415894;

    name = "Zahrun";

  };

  zainkergaye = {

    email = "zain@zkergaye.me";

    github = "zainkergaye";

    githubId = 62440012;

    name = "Zain Kergaye";

  };

  zakame = {

    email = "zakame@zakame.net";

    github = "zakame";

nixos/modules/installer/tools/tools.nix

+0 −2
Original line number Diff line number Diff line
@@ -341,8 +341,6 @@ in 
    system.build = {

      inherit nixos-generate-config nixos-install;

      nixos-rebuild = if config.system.rebuild.enableNg then nixos-rebuild-ng else nixos-rebuild;

      nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option;

      nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter;

    };

  };

}

nixos/modules/services/continuous-integration/github-runner/options.nix

+6 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    default = { };

    type = lib.types.attrsOf (

      lib.types.submodule (

        { name, ... }:

        { name, config, ... }:

        {

          options = {

            enable = lib.mkOption {
@@ -186,7 +186,11 @@ 
              default = { };

            };



            package = lib.mkPackageOption pkgs "github-runner" { };

            package = lib.mkPackageOption pkgs "github-runner" { } // {

              apply =

                # Support old github-runner versions which don't have the `nodeRuntimes` arg yet.

                pkg: pkg.override (old: lib.optionalAttrs (old ? nodeRuntimes) { inherit (config) nodeRuntimes; });

            };



            ephemeral = lib.mkOption {

              type = lib.types.bool;

nixos/modules/services/continuous-integration/github-runner/service.nix

+2 −6
Original line number Diff line number Diff line
@@ -41,10 +41,6 @@ 
        currentConfigTokenFilename = ".current-token";



        workDir = if cfg.workDir == null then runtimeDir else cfg.workDir;

        # Support old github-runner versions which don't have the `nodeRuntimes` arg yet.

        package = cfg.package.override (

          old: lib.optionalAttrs (lib.hasAttr "nodeRuntimes" old) { inherit (cfg) nodeRuntimes; }

        );

      in

      lib.nameValuePair svcName {

        description = "GitHub Actions runner";
@@ -77,7 +73,7 @@ 


        serviceConfig = lib.mkMerge [

          {

            ExecStart = "${package}/bin/Runner.Listener run --startuptype service";

            ExecStart = "${cfg.package}/bin/Runner.Listener run --startuptype service";



            # Does the following, sequentially:

            # - If the module configuration or the token has changed, purge the state directory,
@@ -196,7 +192,7 @@ 
                        else

                          args+=(--token "$token")

                        fi

                        ${package}/bin/Runner.Listener configure "''${args[@]}"

                        ${cfg.package}/bin/Runner.Listener configure "''${args[@]}"

                        # Move the automatically created _diag dir to the logs dir

                        mkdir -p  "$STATE_DIRECTORY/_diag"

                        cp    -r  "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/"

nixos/modules/services/display-managers/sddm.nix

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ in 
      theme = mkOption {

        type = types.str;

        default = "";

        example = lib.literalExpression "\"\${pkgs.where-is-my-sddm-theme.override { variants = [ \"qt5\" ]; }}/share/sddm/themes/where_is_my_sddm_theme_qt5\"";

        description = ''

          Greeter theme to use.

        '';