Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19336,6 +19336,11 @@
githubId = 15833376;
name = "Pierre ROux";
};
provokateurin = {
name = "Kate Döen";
github = "provokateurin";
githubId = 26026535;
};
prrlvr = {
email = "po@prrlvr.fr";
github = "prrlvr";
Expand Down
13 changes: 13 additions & 0 deletions maintainers/team-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,19 @@ with lib.maintainers;
shortName = "Vim/Neovim";
};

nextcloud = {
members = [
bachp
britter
dotlambda
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dotlambda in my head you've been a maintainer and I just got reminded that you aren't. Given you're doing quite a lot of stuff, I figured I could add you. If that's not OK, let me know and I'll remove you again!

ma27
provokateurin
];
scope = "Maintain Nextcloud, its tests and the integration of applications.";
shortName = "Nextcloud";
enableFeatureFreezePing = true;
};

ngi = {
members = [
eljamm
Expand Down
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2505.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,8 @@

- hddfancontrol has been updated to major release 2. See the [migration guide](https://github.com/desbma/hddfancontrol/tree/master?tab=readme-ov-file#migrating-from-v1x), as there are breaking changes.

- `nextcloud-news-updater` is unmaintained and was removed from nixpkgs.

- `services.cloudflared` now uses a dynamic user, and its `user` and `group` options have been removed. If the user or group is still necessary, they can be created manually.

- The Home Assistant module has new options {option}`services.home-assistant.blueprints.automation`, `services.home-assistant.blueprints.script`, and {option}`services.home-assistant.blueprints.template` that allow for the declarative installation of [blueprints](https://www.home-assistant.io/docs/blueprint/) into the appropriate configuration directories.
Expand Down
15 changes: 14 additions & 1 deletion nixos/modules/services/web-apps/nextcloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,20 @@ This can be configured with the [](#opt-services.nextcloud.phpExtraExtensions) s

Alternatively, extra apps can also be declared with the [](#opt-services.nextcloud.extraApps) setting.
When using this setting, apps can no longer be managed statefully because this can lead to Nextcloud updating apps
that are managed by Nix. If you want automatic updates it is recommended that you use web interface to install apps.
that are managed by Nix:

```nix
{ config, pkgs, ... }: {
services.nextcloud.extraApps = with config.services.nextcloud.package.packages.apps; [
inherit user_oidc calendar contacts;
];
}
```

Keep in mind that this is essentially a mirror of the apps from the appstore, but managed in
nixpkgs. This is by no means a curated list of apps that receive special testing on each update.

If you want automatic updates it is recommended that you use web interface to install apps.

## Known warnings {#module-services-nextcloud-known-warnings}

Expand Down
1 change: 1 addition & 0 deletions nixos/modules/services/web-apps/nextcloud.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1356,4 +1356,5 @@ in {
]);

meta.doc = ./nextcloud.md;
meta.maintainers = teams.nextcloud;
}
8 changes: 2 additions & 6 deletions nixos/tests/nextcloud/basic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@ runTest (
{ config, lib, ... }:
{
inherit name;
meta = with lib.maintainers; {
maintainers = [
globin
eqyiel
ma27
];
meta = {
maintainers = lib.teams.nextcloud.members;
};

imports = [ testBase ];
Expand Down
7 changes: 1 addition & 6 deletions nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,7 @@ runTest (
in
{
inherit name;
meta = with lib.maintainers; {
maintainers = [
eqyiel
ma27
];
};
meta.maintainers = lib.teams.nextcloud.members;

imports = [ testBase ];

Expand Down
5 changes: 2 additions & 3 deletions nixos/tests/nextcloud/with-mysql-and-memcached.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ runTest (
{ config, lib, ... }:
{
inherit name;
meta = with lib.maintainers; {
maintainers = [ eqyiel ];
};

meta.maintainers = lib.teams.nextcloud.members;

imports = [ testBase ];

Expand Down
7 changes: 1 addition & 6 deletions nixos/tests/nextcloud/with-objectstore.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@ runTest (
in
{
inherit name;
meta = with lib.maintainers; {
maintainers = [
onny
ma27
];
};
meta.maintainers = lib.teams.nextcloud.members;

imports = [ testBase ];

Expand Down
7 changes: 1 addition & 6 deletions nixos/tests/nextcloud/with-postgresql-and-redis.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,7 @@ runTest (
{ config, lib, ... }:
{
inherit name;
meta = with lib.maintainers; {
maintainers = [
eqyiel
ma27
];
};
meta.maintainers = lib.teams.nextcloud.members;

imports = [ testBase ];

Expand Down
3 changes: 2 additions & 1 deletion pkgs/build-support/fetchnextcloudapp/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
patches ? [ ],
description ? null,
homepage ? null,
maintainers ? [ ],
unpack ? false, # whether to use fetchzip rather than fetchurl
}:
applyPatches (
Expand All @@ -26,7 +27,7 @@ applyPatches (
{
license = lib.licenses.${license};
longDescription = description;
inherit homepage;
inherit homepage maintainers;
}
// lib.optionalAttrs (description != null) {
longDescription = description;
Expand Down
8 changes: 1 addition & 7 deletions pkgs/servers/nextcloud/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,7 @@ let
changelog = "https://nextcloud.com/changelog/#${lib.replaceStrings [ "." ] [ "-" ] version}";
description = "Sharing solution for files, calendars, contacts and more";
homepage = "https://nextcloud.com";
maintainers = with lib.maintainers; [
schneefux
bachp
globin
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@globin @schneefux since I don't recall you doing NC maintenance in the past years(?), I didn't add you to the team. If you want to be part of regardless, let me know.

ma27
britter
];
maintainers = lib.teams.nextcloud.members;
license = lib.licenses.agpl3Plus;
platforms = lib.platforms.linux;
knownVulnerabilities =
Expand Down
28 changes: 0 additions & 28 deletions pkgs/servers/nextcloud/news-updater.nix

This file was deleted.

1 change: 1 addition & 0 deletions pkgs/servers/nextcloud/packages/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ let
appName = pname;
appVersion = data.version;
license = appBaseDefs.${pname};
maintainers = lib.teams.nextcloud.members;
inherit (data)
url
hash
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1072,6 +1072,7 @@ mapAliases {
first on 24.05 because Nextcloud doesn't support upgrades across multiple major versions!
''; # Added 2024-06-25
nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25
nextcloud-news-updater = throw "nextcloud-news-updater has been removed because the project is unmaintained"; # Added 2025-03-28
nagiosPluginsOfficial = monitoring-plugins;
neochat = makePlasma5Throw "neochat"; # added 2022-05-10
nerdfonts = throw ''
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4239,8 +4239,6 @@ with pkgs;
nextcloud30Packages = callPackage ../servers/nextcloud/packages { ncVersion = "30"; };
nextcloud31Packages = callPackage ../servers/nextcloud/packages { ncVersion = "31"; };

nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };

nextcloud-notify_push = callPackage ../servers/nextcloud/notify_push.nix { };

inherit (callPackages ../applications/networking/cluster/nomad { })
Expand Down