diff options
author | Colin Arnott <colin@urandom.co.uk> | 2023-01-15 11:43:27 +0000 |
---|---|---|
committer | Colin Arnott <colin@urandom.co.uk> | 2023-01-28 10:31:56 +0000 |
commit | 64f3a304dbe68237f7fe172cb283e27f82da1ab9 (patch) | |
tree | 598bd0b534098487d300989915cf22659b78a4e0 | |
parent | 1754920c76b6fd0142a680b74e887022b244f3e7 (diff) | |
download | nixpkgs-64f3a304dbe68237f7fe172cb283e27f82da1ab9.tar nixpkgs-64f3a304dbe68237f7fe172cb283e27f82da1ab9.tar.gz nixpkgs-64f3a304dbe68237f7fe172cb283e27f82da1ab9.tar.bz2 nixpkgs-64f3a304dbe68237f7fe172cb283e27f82da1ab9.tar.lz nixpkgs-64f3a304dbe68237f7fe172cb283e27f82da1ab9.tar.xz nixpkgs-64f3a304dbe68237f7fe172cb283e27f82da1ab9.tar.zst nixpkgs-64f3a304dbe68237f7fe172cb283e27f82da1ab9.zip |
nixos/wordpress: ensure default sites includes a theme
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2305.section.xml | 6 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2305.section.md | 2 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/wordpress.nix | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 54c7da4279a..69a6ff4aac0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -305,9 +305,9 @@ <listitem> <para> The <literal>wordpress</literal> derivation no longer contains - any builtin plugins or themes; these can be found in - <literal>wordpressPackages.{plugins,themes}</literal>, - respectively. + any builtin plugins or themes. If you need them you have to + add them back to prevent your site from breaking. You can find + them in <literal>wordpressPackages.{plugins,themes}</literal>. </para> </listitem> <listitem> diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 19b3d2f7e12..b33221714ab 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -77,7 +77,7 @@ In addition to numerous new and upgraded packages, this release has the followin - `tut` has been updated from 1.0.34 to 2.0.0, and now uses the TOML format for the configuration file instead of INI. Additional information can be found [here](https://github.com/RasmusLindroth/tut/releases/tag/2.0.0). -- The `wordpress` derivation no longer contains any builtin plugins or themes; these can be found in `wordpressPackages.{plugins,themes}`, respectively. +- The `wordpress` derivation no longer contains any builtin plugins or themes. If you need them you have to add them back to prevent your site from breaking. You can find them in `wordpressPackages.{plugins,themes}`. - `llvmPackages_rocm.llvm` will not contain `clang` or `compiler-rt`. `llvmPackages_rocm.clang` will not contain `llvm`. `llvmPackages_rocm.clangNoCompilerRt` has been removed in favor of using `llvmPackages_rocm.clang-unwrapped`. diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index aabfb2261bb..d4c987da114 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -156,7 +156,8 @@ let (l: warn "setting this option with a list is deprecated" listToAttrs (map (p: nameValuePair (p.name or (throw "${p} does not have a name")) p) l)) (attrsOf path); - default = {}; + default = { inherit (pkgs.wordpressPackages.themes) twentytwentythree; }; + defaultText = literalExpression "{ inherit (pkgs.wordpressPackages.themes) twentytwentythree; }"; description = lib.mdDoc '' Path(s) to respective theme(s) which are copied from the 'theme' directory. |