[25.05] nextcloud32: init at 32.0.1#456156
Merged
Merged
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
This report is automatically generated by the PR / Check / cherry-pick CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.
Warning
Difference between fa2741c and original 34a7111 may warrant inspection.
Show diff
@@ Metadata
## Commit message ##
nextcloud32: init at 32.0.0
- ## doc/release-notes/rl-2511.section.md ##
-@@
- See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration).
+ Subset of the original commit, without the breaking changes (i.e.
+ changes of defaults).
- - `cloudflare-ddns`: Added package cloudflare-ddns.
-+
-+- `nextcloud32`: Added for the Nextcloud 32 major release.
-+
-+ See https://nextcloud.com/blog/nextcloud-hub25-autumn/ for more details on the new major version.
+ (cherry picked from commit 34a7111f895f78dfe6142c32218cc150115a926c)
## nixos/modules/services/web-apps/nextcloud.md ##
@@ nixos/modules/services/web-apps/nextcloud.md: self-hostable cloud platform. The server setup can be automated using
@@ nixos/modules/services/web-apps/nextcloud.md: self-hostable cloud platform. The
## nixos/modules/services/web-apps/nextcloud.nix ##
@@ nixos/modules/services/web-apps/nextcloud.nix: in
- description = "Which package to use for the Nextcloud instance.";
relatedPackages = [
+ "nextcloud30"
"nextcloud31"
+ "nextcloud32"
];
};
- phpPackage = lib.mkPackageOption pkgs "php" {
-@@ nixos/modules/services/web-apps/nextcloud.nix: in
- {
- warnings =
- let
-- latest = 31;
-+ latest = 32;
- upgradeWarning = major: nixos: ''
- A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.
-
-@@ nixos/modules/services/web-apps/nextcloud.nix: in
- ++ (lib.optional (lib.versionOlder overridePackage.version "28") (upgradeWarning 27 "24.05"))
- ++ (lib.optional (lib.versionOlder overridePackage.version "29") (upgradeWarning 28 "24.11"))
- ++ (lib.optional (lib.versionOlder overridePackage.version "30") (upgradeWarning 29 "24.11"))
-- ++ (lib.optional (lib.versionOlder overridePackage.version "31") (upgradeWarning 30 "25.05"));
-+ ++ (lib.optional (lib.versionOlder overridePackage.version "31") (upgradeWarning 30 "25.05"))
-+ ++ (lib.optional (lib.versionOlder overridePackage.version "32") (upgradeWarning 31 "25.11"));
-
- services.nextcloud.package = lib.mkDefault (
- if pkgs ? nextcloud then
-@@ nixos/modules/services/web-apps/nextcloud.nix: in
- pkgs.nextcloud29
- else if lib.versionOlder stateVersion "25.05" then
- pkgs.nextcloud30
-- else
-+ else if lib.versionOlder stateVersion "25.11" then
- pkgs.nextcloud31
-+ else
-+ pkgs.nextcloud32
- );
-
- services.nextcloud.phpOptions = lib.mkMerge [
+ phpPackage = mkPackageOption pkgs "php" {
## nixos/tests/nextcloud/default.nix ##
-@@ nixos/tests/nextcloud/default.nix: in
- listToAttrs (
+@@ nixos/tests/nextcloud/default.nix: listToAttrs (
concatMap genTests [
+ 30
31
+ 32
]
@@ nixos/tests/nextcloud/default.nix: in
## pkgs/servers/nextcloud/default.nix ##
@@
- cacert,
caBundle ? "${cacert}/etc/ssl/certs/ca-bundle.crt",
+ nextcloud30Packages,
nextcloud31Packages,
+ nextcloud32Packages,
}:
@@ pkgs/servers/nextcloud/packages/32.json (new)
## pkgs/top-level/all-packages.nix ##
@@ pkgs/top-level/all-packages.nix: with pkgs;
-
inherit (callPackages ../servers/nextcloud { })
+ nextcloud30
nextcloud31
+ nextcloud32
;
+ nextcloud30Packages = callPackage ../servers/nextcloud/packages { ncVersion = "30"; };
nextcloud31Packages = callPackage ../servers/nextcloud/packages { ncVersion = "31"; };
+ nextcloud32Packages = callPackage ../servers/nextcloud/packages { ncVersion = "32"; };
Warning
Difference between d598b79 and original 0f7ecd2 may warrant inspection.
Show diff
@@ Metadata
## Commit message ##
nextcloudPackages.apps: update
- ## pkgs/servers/nextcloud/packages/31.json ##
-@@
- ]
- },
- "mail": {
-- "hash": "sha256-BvgDPCjgc5Hl93ueobErfuREhmjdoQBqOlXYpVJM9uo=",
-- "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.10/mail-v5.5.10.tar.gz",
-- "version": "5.5.10",
-+ "hash": "sha256-Y+xAJsRUlqZLCpMsgunm97+9pP6kAoLS8rAIm5KrVfE=",
-+ "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.11/mail-v5.5.11.tar.gz",
-+ "version": "5.5.11",
- "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
- "homepage": "https://github.com/nextcloud/mail#readme",
- "licenses": [
-@@
- ]
- },
- "news": {
-- "hash": "sha256-C4A1kb41DCS3FtConpJ+g9TBEIlaUqW9YC6Ha3bj0Yw=",
-- "url": "https://github.com/nextcloud/news/releases/download/27.0.0/news.tar.gz",
-- "version": "27.0.0",
-+ "hash": "sha256-K93swGriEwm1zBq9H7F4P2fHmTanYddFARfQp456bds=",
-+ "url": "https://github.com/nextcloud/news/releases/download/27.0.1/news.tar.gz",
-+ "version": "27.0.1",
- "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
- "homepage": "https://github.com/nextcloud/news",
- "licenses": [
-@@
- ]
- },
- "tables": {
-- "hash": "sha256-E68fyimEMBe0DJ2cOAIBs0+Psb8UVFFfLBZc/ESRzY8=",
-- "url": "https://github.com/nextcloud-releases/tables/releases/download/v0.9.5/tables-v0.9.5.tar.gz",
-- "version": "0.9.5",
-- "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
-+ "hash": "sha256-0Dvw5BR5hfVW/bmZ4sD6RawL25jHv9bla/q7bbh1RgQ=",
-+ "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.0/tables-v1.0.0.tar.gz",
-+ "version": "1.0.0",
-+ "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n- Users, groups and teams\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
- "homepage": "https://github.com/nextcloud/tables",
- "licenses": [
- "agpl"
- ]
- },
- "tasks": {
-- "hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=",
-- "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz",
-- "version": "0.16.1",
-+ "hash": "sha256-h3u9xR3zguKvVWXA7CNSde2sEdvgsT18cYAHp8dKPSg=",
-+ "url": "https://github.com/nextcloud/tasks/releases/download/v0.17.0/tasks.tar.gz",
-+ "version": "0.17.0",
- "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
- "homepage": "https://github.com/nextcloud/tasks/",
- "licenses": [
+ (cherry picked from commit 0f7ecd28e46063af29b2f034e1ceb4cf7992b614)
## pkgs/servers/nextcloud/packages/32.json ##
@@
]
},
"mail": {
-- "hash": "sha256-BvgDPCjgc5Hl93ueobErfuREhmjdoQBqOlXYpVJM9uo=",
-- "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.10/mail-v5.5.10.tar.gz",
-- "version": "5.5.10",
+- "hash": "sha256-7quVg4jNTt1R+rH6/D3lDVOL+i+i+BQAGYg0z5kLapE=",
+- "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.6/mail-v5.5.6.tar.gz",
+- "version": "5.5.6",
+ "hash": "sha256-Y+xAJsRUlqZLCpMsgunm97+9pP6kAoLS8rAIm5KrVfE=",
+ "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.11/mail-v5.5.11.tar.gz",
+ "version": "5.5.11",
@@ pkgs/servers/nextcloud/packages/32.json
"agpl"
]
},
- "tasks": {
-- "hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=",
-- "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz",
-- "version": "0.16.1",
++ "tasks": {
+ "hash": "sha256-h3u9xR3zguKvVWXA7CNSde2sEdvgsT18cYAHp8dKPSg=",
+ "url": "https://github.com/nextcloud/tasks/releases/download/v0.17.0/tasks.tar.gz",
+ "version": "0.17.0",
- "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
- "homepage": "https://github.com/nextcloud/tasks/",
- "licenses": [
++ "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
++ "homepage": "https://github.com/nextcloud/tasks/",
++ "licenses": [
++ "agpl"
++ ]
++ },
++ "theming_customcss": {
++ "hash": "sha256-tDU6GIGX5PFr6+iBYjUl4iGcZKUmc/3MUBt5xD561uw=",
++ "url": "https://github.com/nextcloud-releases/theming_customcss/releases/download/v1.19.0/theming_customcss.tar.gz",
++ "version": "1.19.0",
++ "description": "Adjust the Nextcloud theme with custom CSS",
++ "homepage": "",
++ "licenses": [
++ "agpl"
++ ]
++ },
++ "twofactor_admin": {
++ "hash": "sha256-zZvH7xfSooKBG4CKvSuf8D/6KnKEunLa+DRLAkWGoow=",
++ "url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.8.0/twofactor_admin.tar.gz",
++ "version": "4.8.0",
++ "description": "This two-factor auth (2FA) provider for Nextcloud allows admins to generate a one-time\n\t\tcode for users to log into a 2FA protected account. This is helpful in situations where\n\t\tusers have lost access to their other 2FA methods or mandatory 2FA without any previously\n\t\tenabled 2FA provider.",
++ "homepage": "",
++ "licenses": [
++ "agpl"
++ ]
++ },
+ "twofactor_webauthn": {
+ "hash": "sha256-B1Oje5oX68i9Q/IGFvxjN9Q+78Snq3yusgkgd8Mh3LQ=",
+ "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.4.1/twofactor_webauthn-v2.4.1.tar.gz",
Hint: The full diffs are also available in the runner logs with slightly better highlighting.
provokateurin
approved these changes
Oct 27, 2025
nixpkgs-ci
Bot
added
10.rebuild-linux: 1-10
Ma27
dismissed
github-actions[bot]’s stale review
October 27, 2025 11:32
Intentionally not a full backport: that would be breaking. We only backport new majors without changing the defaults in the module for Nextcloud.
Ma27
added this pull request to the merge queue
Oct 27, 2025
Merged
via the queue into
NixOS:release-25.05
with commit Oct 27, 2025
c9c5832
36 of 39 checks passed
Member
|
Shouldn't we also backport #421813 ? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport non-breaking portions of nextcloud32 to 25.05
Backports #446632 #454991
cc @provokateurin
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.