Skip to content

Commit a36183d

Browse files
committedMar 21, 2025
wordpressPackages: recurseIntoAttrs
1 parent 7598f08 commit a36183d

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed
 

‎pkgs/servers/web-apps/wordpress/packages/default.nix

+12-10
Original file line numberDiff line numberDiff line change
@@ -184,16 +184,18 @@ let
184184
}
185185
// lib.mapAttrs (
186186
type: pkgs:
187-
lib.makeExtensible (
188-
_:
189-
lib.mapAttrs (
190-
pname: data:
191-
self.mkOfficialWordpressDerivation {
192-
type = lib.removeSuffix "s" type;
193-
inherit pname data;
194-
license = sourceJson.${type}.${pname};
195-
}
196-
) pkgs
187+
lib.recurseIntoAttrs (
188+
lib.makeExtensible (
189+
_:
190+
lib.mapAttrs (
191+
pname: data:
192+
self.mkOfficialWordpressDerivation {
193+
type = lib.removeSuffix "s" type;
194+
inherit pname data;
195+
license = sourceJson.${type}.${pname};
196+
}
197+
) pkgs
198+
)
197199
)
198200
) generatedJson;
199201

‎pkgs/top-level/all-packages.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -17872,7 +17872,7 @@ with pkgs;
1787217872
inherit (callPackage ../servers/web-apps/wordpress {})
1787317873
wordpress wordpress_6_7;
1787417874

17875-
wordpressPackages = ( callPackage ../servers/web-apps/wordpress/packages {
17875+
wordpressPackages = recurseIntoAttrs ( callPackage ../servers/web-apps/wordpress/packages {
1787617876
plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json;
1787717877
themes = lib.importJSON ../servers/web-apps/wordpress/packages/themes.json;
1787817878
languages = lib.importJSON ../servers/web-apps/wordpress/packages/languages.json;

0 commit comments

Comments
 (0)
Failed to load comments.