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

nextcloud: refactor path out of all-packages

Browse Source
This commit is contained in:
Beardhatcode
2024-11-23 21:23:51 +01:00
parent 06e8efb692
commit bf14b9fdba
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/nextcloud/packages/default.nix
+3 -4
View File
@@ -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)
pkgs/top-level/all-packages.nix
+3 -9
View File
@@ -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 { };