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

Merge master into staging-next

parents 7044a043 798c30d1

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -28853,6 +28853,12 @@ 
    githubId = 450885;

    name = "Francesco Zanini";

  };

  zareix = {

    email = "contact@raphael-catarino.fr";

    github = "zareix";

    githubId = 29818713;

    name = "Raphaël Catarino";

  };

  zarelit = {

    email = "david@zarel.net";

    github = "zarelit";

nixos/modules/services/monitoring/gitwatch.nix

+12 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ let 
        getvar = flag: var: optionalString (cfg."${var}" != null) "${flag} ${cfg."${var}"}";

        branch = getvar "-b" "branch";

        remote = getvar "-r" "remote";

        message = getvar "-m" "message";

      in

      rec {

        inherit (cfg) enable;
@@ -37,7 +38,7 @@ let 
          if [ -n "${cfg.remote}" ] && ! [ -d "${cfg.path}" ]; then

            git clone ${branch} "${cfg.remote}" "${cfg.path}"

          fi

          gitwatch ${remote} ${branch} ${cfg.path}

          gitwatch ${remote} ${message} ${branch} ${cfg.path}

        '';

        serviceConfig.User = cfg.user;

      }
@@ -56,6 +57,7 @@ in 
        user = "user";

        path = "/home/user/watched-project";

        remote = "git@github.com:me/my-project.git";

        message = "Auto-commit by gitwatch on %d";

      };

      disabled-repo = {

        enable = false;
@@ -84,6 +86,11 @@ in 
            type = nullOr str;

            default = null;

          };

          message = lib.mkOption {

            description = "Optional text to use in as commit message; all occurrences of `%d` will be replaced by formatted date/time";

            type = nullOr str;

            default = null;

          };

          branch = mkOption {

            description = "Optional branch in remote repository";

            type = nullOr str;
@@ -93,5 +100,8 @@ in 
      });

  };

  config.systemd.services = mapAttrs' mkSystemdService config.services.gitwatch;

  meta.maintainers = with maintainers; [ shved ];

  meta.maintainers = with maintainers; [

    shved

    zareix

  ];

}