Unverified Commit ed0d5e90 authored by isabel's avatar isabel Committed by GitHub
Browse files

nixos/{nix-gc, nix-optimise}: allow dates to be a list or str (#405219)

parents 76105bbf 57d05a1c

nixos/modules/services/misc/nix-gc.nix

+4 −3
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ in 
      };



      dates = lib.mkOption {

        type = lib.types.singleLineStr;

        default = "03:15";

        type = with lib.types; either singleLineStr (listOf str);

        apply = lib.toList;

        default = [ "03:15" ];

        example = "weekly";

        description = ''

          How often or when garbage collection is performed. For most desktop and server systems
@@ -86,7 +87,7 @@ in 
      description = "Nix Garbage Collector";

      script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}";

      serviceConfig.Type = "oneshot";

      startAt = lib.optional cfg.automatic cfg.dates;

      startAt = lib.optionals cfg.automatic cfg.dates;

    };



    systemd.timers.nix-gc = lib.mkIf cfg.automatic {

nixos/modules/services/misc/nix-optimise.nix

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ in 


      dates = lib.mkOption {

        default = [ "03:45" ];

        type = with lib.types; listOf str;

        apply = lib.toList;

        type = with lib.types; either singleLineStr (listOf str);

        description = ''

          Specification (in the format described by

          {manpage}`systemd.time(7)`) of the time at