Retropex/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge: nixos/nextcloud: add maintainer team, update docs about maintainership of apps (#393069)

Browse Source
This commit is contained in:
Maximilian Bosch 2025-04-01 11:25:28 +02:00 committed by GitHub
commit f20b220e17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 47 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -19390,6 +19390,11 @@
githubId = 15833376;
name = "Pierre ROux";
};
provokateurin = {
name = "Kate Döen";
github = "provokateurin";
githubId = 26026535;
};
prrlvr = {
email = "po@prrlvr.fr";
github = "prrlvr";

13
maintainers/team-list.nix
View File

@ -864,6 +864,19 @@ with lib.maintainers;
shortName = "Vim/Neovim";
};
nextcloud = {
members = [
bachp
britter
dotlambda
ma27
provokateurin
];
scope = "Maintain Nextcloud, its tests and the integration of applications.";
shortName = "Nextcloud";
enableFeatureFreezePing = true;
};
ngi = {
members = [
eljamm

2
nixos/doc/manual/release-notes/rl-2505.section.md
View File

@ -390,6 +390,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.

15
nixos/modules/services/web-apps/nextcloud.md
View File

@ -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}

1
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -1363,4 +1363,5 @@ in {
]);
meta.doc = ./nextcloud.md;
meta.maintainers = teams.nextcloud;
}

8
nixos/tests/nextcloud/basic.nix
View File

@ -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 ];

7
nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
View File

@ -14,12 +14,7 @@ runTest (
in
{
inherit name;
meta = with lib.maintainers; {
maintainers = [
eqyiel
ma27
];
};
meta.maintainers = lib.teams.nextcloud.members;
imports = [ testBase ];

5
nixos/tests/nextcloud/with-mysql-and-memcached.nix
View File

@ -11,9 +11,8 @@ runTest (
{ config, lib, ... }:
{
inherit name;
meta = with lib.maintainers; {
maintainers = [ eqyiel ];
};
meta.maintainers = lib.teams.nextcloud.members;
imports = [ testBase ];

7
nixos/tests/nextcloud/with-objectstore.nix
View File

@ -20,12 +20,7 @@ runTest (
in
{
inherit name;
meta = with lib.maintainers; {
maintainers = [
onny
ma27
];
};
meta.maintainers = lib.teams.nextcloud.members;
imports = [ testBase ];

7
nixos/tests/nextcloud/with-postgresql-and-redis.nix
View File

@ -11,12 +11,7 @@ runTest (
{ config, lib, ... }:
{
inherit name;
meta = with lib.maintainers; {
maintainers = [
eqyiel
ma27
];
};
meta.maintainers = lib.teams.nextcloud.members;
imports = [ testBase ];

3
pkgs/build-support/fetchnextcloudapp/default.nix
View File

@ -15,6 +15,7 @@
patches ? [ ],
description ? null,
homepage ? null,
maintainers ? [ ],
unpack ? false, # whether to use fetchzip rather than fetchurl
}:
applyPatches (
@ -26,7 +27,7 @@ applyPatches (
{
license = lib.licenses.${license};
longDescription = description;
inherit homepage;
inherit homepage maintainers;
}
// lib.optionalAttrs (description != null) {
longDescription = description;

8
pkgs/servers/nextcloud/default.nix
View File

@ -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
ma27
britter
];
maintainers = lib.teams.nextcloud.members;
license = lib.licenses.agpl3Plus;
platforms = lib.platforms.linux;
knownVulnerabilities =

28
pkgs/servers/nextcloud/news-updater.nix
View File

@ -1,28 +0,0 @@
{
lib,
fetchurl,
python3Packages,
php,
}:
python3Packages.buildPythonApplication rec {
pname = "nextcloud-news-updater";
version = "11.0.0";
src = fetchurl {
url = "mirror://pypi/n/nextcloud_news_updater/nextcloud_news_updater-${version}.tar.gz";
sha256 = "bc2055c16f0dbf610b7e17650508a18fa5a1de652ecdf69c5d4073c97376e9cf";
};
doCheck = false;
propagatedBuildInputs = [ php ];
meta = {
description = "Fast parallel feed updater for the Nextcloud news app";
mainProgram = "nextcloud-news-updater";
homepage = "https://github.com/nextcloud/news-updater";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ schneefux ];
};
}

1
pkgs/servers/nextcloud/packages/default.nix
View File

@ -32,6 +32,7 @@ let
appName = pname;
appVersion = data.version;
license = appBaseDefs.${pname};
maintainers = lib.teams.nextcloud.members;
inherit (data)
url
hash

1
pkgs/top-level/aliases.nix
View File

@ -1073,6 +1073,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 ''

2
pkgs/top-level/all-packages.nix
View File

@ -4139,8 +4139,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 { })