Skip to content

Commit e5571da

Browse files
committed
wordpressPackages: recurseIntoAttrs
1 parent 1333865 commit e5571da

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

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

Lines changed: 12 additions & 10 deletions
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19261,7 +19261,7 @@ with pkgs;
1926119261
wordpress_6_7
1926219262
;
1926319263

19264-
wordpressPackages = (
19264+
wordpressPackages = recurseIntoAttrs (
1926519265
callPackage ../servers/web-apps/wordpress/packages {
1926619266
plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json;
1926719267
themes = lib.importJSON ../servers/web-apps/wordpress/packages/themes.json;

0 commit comments

Comments
 (0)