diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-13 12:13:25 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-13 12:13:25 +0200 |
commit | 658b7c3f2ebb7d04d950b95ce81cd5fea2a03141 (patch) | |
tree | fdcfa83f21b9c98315a3a751ef4d27772976589a /nixos/modules/services/misc | |
parent | f14841f3ce734b27988a605fc9775a035d313d23 (diff) | |
parent | a2981671523416ad5c9a49de8c16ac8fccb2306b (diff) | |
download | nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.gz nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.bz2 nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.lz nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.xz nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.zst nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.zip |
Merge master into staging
Diffstat (limited to 'nixos/modules/services/misc')
-rw-r--r-- | nixos/modules/services/misc/matrix-synapse.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 10901e102225..f7441988b272 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -342,7 +342,7 @@ in { }; database_type = mkOption { type = types.enum [ "sqlite3" "psycopg2" ]; - default = if versionAtLeast config.system.stateVersion "18.03" + default = if versionAtLeast config.system.nixos.stateVersion "18.03" then "psycopg2" else "sqlite3"; description = '' |