Merge pull request #315 from NuschtOS/nextcloud

nextcloud: use config.services.nextcloud.package.packages.apps instead of manually building it

Author: SuperSandro2000

flake.lock

@@ -2,7 +2,7 @@
 
 let
   cfg = config.services.nextcloud;
-  inherit (pkgs."nextcloud${lib.versions.major cfg.package.version}Packages") apps;
+  inherit (config.services.nextcloud.package.packages) apps;
 in
 {
   options = {
@@ -37,7 +37,7 @@ in
       configureRecognize has been removed in favor of using the recognize packages from NixOS like:
 
       services.nextcloud.extraApps = {
-        inherit (pkgs."nextcloud${lib.versions.major config.services.nextcloud.package.version}Packages".apps) recognize;
+        inherit (config.services.nextcloud.package.packages.apps) recognize;
       };
     '')
   ];

modules/nextcloud.nix

@@ -161,7 +161,7 @@ in
                 # traps: nginx[xxxxxx] trap invalid opcode ip:7fa6c23ebe79 sp:7ffcceaaa9e0 error:0 in memfd:sljit[1e79,7fa6c23ea000+10000]
                 pcre2 = pkgs.pcre2.override { withJitSealloc = false; };
               }).overrideAttrs ({ patches ? [ ], ... }: {
-                patches = patches ++ [
+                patches = patches ++ lib.optionals (lib.versionOlder pkg.version "1.29.2") [
                   (let
                     mjMn = lib.versions.majorMinor;
                     # nginx 1.29 is supported since https://github.com/aws/aws-lc/commit/050d696415f2b7a07fc791ded31f5e12ec82f5fe