From a8c97ad23e21284d4e05b4de1a5e19cbb061d777 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 25 Sep 2017 12:18:42 +0200 Subject: [PATCH] nixos/radicale: fix default version (#29743) --- nixos/modules/services/networking/radicale.nix | 2 +- nixos/tests/radicale.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index 56f2e976cff..391f4bdebba 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -9,7 +9,7 @@ let confFile = pkgs.writeText "radicale.conf" cfg.config; # This enables us to default to version 2 while still not breaking configurations of people with version 1 - defaultPackage = if versionAtLeast "17.09" config.system.stateVersion then { + defaultPackage = if versionAtLeast config.system.stateVersion "17.09" then { pkg = pkgs.radicale2; text = "pkgs.radicale2"; } else { diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix index 2c888469d0a..f694fc75ef7 100644 --- a/nixos/tests/radicale.nix +++ b/nixos/tests/radicale.nix @@ -43,6 +43,7 @@ in }); }) ]; + system.stateVersion = "17.03"; }; radicale1_export = lib.recursiveUpdate radicale1 { services.radicale.extraArgs = [