movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-02-13 00:36:15 +00:00 • committed by GitHub
commit c4d734932d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
90 changed files with 2517 additions and 1444 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/mail/dovecot.nix
View file

@ -463,7 +463,7 @@ in
environment.systemPackages = [ dovecotPkg ];
warnings = mkIf (any isList options.services.dovecot2.mailboxes.definitions) [
"Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03! See the release notes for more info for migration."
"Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.05! See the release notes for more info for migration."
];
assertions = [

2
nixos/modules/services/networking/kresd.nix
View file

@ -140,7 +140,7 @@ in {
# Try cleaning up the previously default location of cache file.
# Note that /var/cache/* should always be safe to remove.
# TODO: remove later, probably between 20.09 and 21.03
# TODO: remove later, probably between 20.09 and 21.05
systemd.tmpfiles.rules = [ "R /var/cache/kresd" ];
};
}

4
nixos/modules/services/web-apps/hedgedoc.nix
View file

@ -5,6 +5,10 @@ with lib;
let
cfg = config.services.hedgedoc;
# 21.03 will not be an official release - it was instead 21.05. This
# versionAtLeast statement remains set to 21.03 for backwards compatibility.
# See https://github.com/NixOS/nixpkgs/pull/108899 and
# https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md.
name = if versionAtLeast config.system.stateVersion "21.03"
then "hedgedoc"
else "codimd";

1
nixos/modules/services/web-apps/mastodon.nix
View file

@ -367,6 +367,7 @@ in {
'' else "") + ''
EOF
'';
environment = env;
serviceConfig = {
Type = "oneshot";
User = cfg.user;

6
nixos/modules/services/web-apps/nextcloud.nix
View file

@ -368,7 +368,7 @@ in {
'')
++ (optional (versionOlder cfg.package.version "18") (upgradeWarning 17 "20.03"))
++ (optional (versionOlder cfg.package.version "19") (upgradeWarning 18 "20.09"))
++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.03"));
++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.05"));
services.nextcloud.package = with pkgs;
mkDefault (
@ -380,6 +380,10 @@ in {
''
else if versionOlder stateVersion "20.03" then nextcloud17
else if versionOlder stateVersion "20.09" then nextcloud18
# 21.03 will not be an official release - it was instead 21.05.
# This versionOlder statement remains set to 21.03 for backwards compatibility.
# See https://github.com/NixOS/nixpkgs/pull/108899 and
# https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md.
else if versionOlder stateVersion "21.03" then nextcloud19
else nextcloud20
);