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

Merge staging-next into staging

parents b0b23853 47157337

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

+7 −0
Original line number Diff line number Diff line
@@ -5005,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";

nixos/modules/services/backup/borgbackup.nix

+10 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ let 
      ${mkKeepArgs cfg} \

      ${optionalString (cfg.prune.prefix != null) "--glob-archives ${escapeShellArg "${cfg.prune.prefix}*"}"} \

      $extraPruneArgs

    borg compact $extraArgs $extraCompactArgs

    ${cfg.postPrune}

  '');
@@ -638,6 +639,15 @@ in { 
            example = "--save-space";

          };



          extraCompactArgs = mkOption {

            type = types.str;

            description = lib.mdDoc ''

              Additional arguments for {command}`borg compact`.

              Can also be set at runtime using `$extraCompactArgs`.

            '';

            default = "";

            example = "--cleanup-commits";

          };

        };

      }

    ));

nixos/modules/services/continuous-integration/buildbot/master.nix

+6 −5
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ let 
  cfg = config.services.buildbot-master;

  opt = options.services.buildbot-master;



  python = cfg.package.pythonModule;

  package = pkgs.python3.pkgs.toPythonModule cfg.package;

  python = package.pythonModule;



  escapeStr = escape [ "'" ];
@@ -212,10 +213,10 @@ in { 


      package = mkOption {

        type = types.package;

        default = pkgs.python3Packages.buildbot-full;

        defaultText = literalExpression "pkgs.python3Packages.buildbot-full";

        default = pkgs.buildbot-full;

        defaultText = literalExpression "pkgs.buildbot-full";

        description = lib.mdDoc "Package to use for buildbot.";

        example = literalExpression "pkgs.python3Packages.buildbot";

        example = literalExpression "pkgs.buildbot";

      };



      packages = mkOption {
@@ -255,7 +256,7 @@ in { 
      after = [ "network-online.target" ];

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

      path = cfg.packages ++ cfg.pythonPackages python.pkgs;

      environment.PYTHONPATH = "${python.withPackages (self: cfg.pythonPackages self ++ [ cfg.package ])}/${python.sitePackages}";

      environment.PYTHONPATH = "${python.withPackages (self: cfg.pythonPackages self ++ [ package ])}/${python.sitePackages}";



      preStart = ''

        mkdir -vp "${cfg.buildbotDir}"

nixos/modules/services/continuous-integration/buildbot/worker.nix

+4 −3
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ let 
  cfg = config.services.buildbot-worker;

  opt = options.services.buildbot-worker;



  python = cfg.package.pythonModule;

  package = pkgs.python3.pkgs.toPythonModule cfg.package;

  python = package.pythonModule;



  tacFile = pkgs.writeText "aur-buildbot-worker.tac" ''

    import os
@@ -129,7 +130,7 @@ in { 


      package = mkOption {

        type = types.package;

        default = pkgs.python3Packages.buildbot-worker;

        default = pkgs.buildbot-worker;

        defaultText = literalExpression "pkgs.python3Packages.buildbot-worker";

        description = lib.mdDoc "Package to use for buildbot worker.";

        example = literalExpression "pkgs.python2Packages.buildbot-worker";
@@ -168,7 +169,7 @@ in { 
      after = [ "network.target" "buildbot-master.service" ];

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

      path = cfg.packages;

      environment.PYTHONPATH = "${python.withPackages (p: [ cfg.package ])}/${python.sitePackages}";

      environment.PYTHONPATH = "${python.withPackages (p: [ package ])}/${python.sitePackages}";



      preStart = ''

        mkdir -vp "${cfg.buildbotDir}/info"