diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-18 18:01:38 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-18 18:01:38 +0000 |
commit | c12ce83e4e763efd65257d9d89160c8d40ea72da (patch) | |
tree | 09d01824a9393dac1a54583693446ee4ffad621b /nixos/modules/services/web-servers | |
parent | 3c8c81154a614432b7f127ec5cf6c2cb7934df91 (diff) | |
parent | de8dd334ab6a16ccb88f2ba208656f9c5dfcbc42 (diff) | |
download | nixlib-c12ce83e4e763efd65257d9d89160c8d40ea72da.tar nixlib-c12ce83e4e763efd65257d9d89160c8d40ea72da.tar.gz nixlib-c12ce83e4e763efd65257d9d89160c8d40ea72da.tar.bz2 nixlib-c12ce83e4e763efd65257d9d89160c8d40ea72da.tar.lz nixlib-c12ce83e4e763efd65257d9d89160c8d40ea72da.tar.xz nixlib-c12ce83e4e763efd65257d9d89160c8d40ea72da.tar.zst nixlib-c12ce83e4e763efd65257d9d89160c8d40ea72da.zip |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/services/web-servers')
-rw-r--r-- | nixos/modules/services/web-servers/garage.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 80fb24fe2c5e..731d5315f23a 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.garage; - toml = pkgs.formats.toml {}; + toml = pkgs.formats.toml { }; configFile = toml.generate "garage.toml" cfg.settings; in { @@ -19,8 +19,8 @@ in extraEnvironment = mkOption { type = types.attrsOf types.str; description = lib.mdDoc "Extra environment variables to pass to the Garage server."; - default = {}; - example = { RUST_BACKTRACE="yes"; }; + default = { }; + example = { RUST_BACKTRACE = "yes"; }; }; environmentFile = mkOption { @@ -30,7 +30,7 @@ in }; logLevel = mkOption { - type = types.enum (["info" "debug" "trace"]); + type = types.enum ([ "info" "debug" "trace" ]); default = "info"; example = "debug"; description = lib.mdDoc "Garage log level, see <https://garagehq.deuxfleurs.fr/documentation/quick-start/#launching-the-garage-server> for examples."; @@ -65,12 +65,8 @@ in }; package = mkOption { - # TODO: when 23.05 is released and if Garage 0.9 is the default, put a stateVersion check. - default = if versionAtLeast config.system.stateVersion "23.05" then pkgs.garage_0_8 - else pkgs.garage_0_7; - defaultText = literalExpression "pkgs.garage_0_7"; type = types.package; - description = lib.mdDoc "Garage package to use, if you are upgrading from a major version, please read NixOS and Garage release notes for upgrade instructions."; + description = lib.mdDoc "Garage package to use, needs to be set explicitly. If you are upgrading from a major version, please read NixOS and Garage release notes for upgrade instructions."; }; }; |