diff --git a/pkgs/servers/nextcloud/packages/default.nix b/pkgs/servers/nextcloud/packages/default.nix index 7158bf8a2d0a..bc3534b8aefb 100644 --- a/pkgs/servers/nextcloud/packages/default.nix +++ b/pkgs/servers/nextcloud/packages/default.nix @@ -6,11 +6,12 @@ lib, pkgs, newScope, - apps, callPackage, + ncVersion, }: let + apps = lib.importJSON (./. + "/${ncVersion}.json"); packages = self: let @@ -54,6 +55,4 @@ let ) generatedJson; in -(lib.makeExtensible (_: (lib.makeScope newScope packages))).extend ( - import ./thirdparty.nix -) +(lib.makeExtensible (_: (lib.makeScope newScope packages))).extend (import ./thirdparty.nix) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03c9fcccf3b6..db1a68c9244b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4531,15 +4531,9 @@ with pkgs; inherit (callPackages ../servers/nextcloud {}) nextcloud28 nextcloud29 nextcloud30; - nextcloud28Packages = callPackage ../servers/nextcloud/packages { - apps = lib.importJSON ../servers/nextcloud/packages/28.json; - }; - nextcloud29Packages = callPackage ../servers/nextcloud/packages { - apps = lib.importJSON ../servers/nextcloud/packages/29.json; - }; - nextcloud30Packages = callPackage ../servers/nextcloud/packages { - apps = lib.importJSON ../servers/nextcloud/packages/30.json; - }; + nextcloud28Packages = callPackage ../servers/nextcloud/packages { ncVersion = "28"; }; + nextcloud29Packages = callPackage ../servers/nextcloud/packages { ncVersion = "29"; }; + nextcloud30Packages = callPackage ../servers/nextcloud/packages { ncVersion = "30"; }; nextcloud-client = qt6Packages.callPackage ../applications/networking/nextcloud-client { };