diff options
| author | Jonas Heinrich <onny@project-insanity.org> | 2024-06-27 14:09:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-27 14:09:29 +0200 |
| commit | 77e77688497b4985f4e672bf1e1397c165602ef5 (patch) | |
| tree | 85b0fbfda3a5eeabc6d1a31d0017d573b69be72b /nixos | |
| parent | 58519c15eb960041b71b8222980a901e150c40f3 (diff) | |
| parent | 70d8f4cf1e9fc6eded6eeffd2ad9796ae7c657f4 (diff) | |
Merge pull request #322397 from Ma27/bump-nextcloud
nextcloud: drop 27, 28.0.6 -> 28.0.7, 29.0.2 -> 29.0.3
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2411.section.md | 2 | ||||
| -rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/nextcloud/default.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 984862d5af9e7..d94df902dd3d6 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -58,6 +58,8 @@ nvimpager settings: user commands in `-c` and `--cmd` now override the respective default settings because they are executed later. +- `pkgs.nextcloud27` has been removed since it's EOL. + - `services.forgejo.mailerPasswordFile` has been deprecated by the drop-in replacement `services.forgejo.secrets.mailer.PASSWD`, which is part of the new free-form `services.forgejo.secrets` option. `services.forgejo.secrets` is a small wrapper over systemd's `LoadCredential=`. It has the same structure (sections/keys) as diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index a4a1f399f4e22..bfb3e73e65102 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -300,7 +300,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud26" "nextcloud27" "nextcloud28" ]; + relatedPackages = [ "nextcloud28" "nextcloud29" ]; }; phpPackage = mkPackageOption pkgs "php" { example = "php82"; @@ -861,8 +861,6 @@ in { nextcloud defined in an overlay, please set `services.nextcloud.package` to `pkgs.nextcloud`. '' - else if versionOlder stateVersion "23.05" then nextcloud25 - else if versionOlder stateVersion "23.11" then nextcloud26 else if versionOlder stateVersion "24.05" then nextcloud27 else nextcloud29 ); diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index 33aa227d2b032..9f8b06561b074 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -109,4 +109,4 @@ let ./with-objectstore.nix ]; in -listToAttrs (concatMap genTests [ 27 28 29 ]) +listToAttrs (concatMap genTests [ 28 29 ]) |