Commit graph

66 commits

Author SHA1 Message Date
Maximilian Bosch 3d04c5aaa8
nixos/dokuwiki: use php 8.4
PHP 8.1 needs to be removed since it'll be EOLed by the end of the year.
2025-10-03 22:57:06 +02:00
Wolfgang Walther 5a0711127c
treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Silvan Mosberger 374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
Jonas Heinrich 46e424a858
nixos/dokuwiki: Remove unused enable option (#391057) 2025-03-24 10:30:51 +01:00
e1mo 100559d83c
nixos/dokuwiki: Remove unused enable option
The option has been added in 50029ed89c
but never had any effect. As far as I could tell, it was only added for
backward compatibility. I think it's safe to remove this after 3+ years.

I opted for removal instead of implementing it since the module will
just do nothing if no site is configure, thus no enable / disable switch
is needed. Especially on a per-site level.
2025-03-18 20:36:09 +01:00
piegames 603733851b treewide: Fix incorrect string escapes 2025-01-07 19:49:28 +01:00
Lukas Werling 1475f480d5 nixos/dokuwiki: Don't force http with Caddy
Caddy usually expects just a hostname without scheme to do its automatic
HTTPS.  It is possible to get the old behavior (only HTTP) by setting
`services.caddy.virtualHosts.<host>.hostName`.
2024-12-09 11:49:52 +01:00
e1mo 4f899ed44d
nixos/dokuwiki,nixos/wordpress,nixos/invoiceplane: Remove deprecated isCoercibleToString
Close #292788
2024-10-08 11:53:03 +02:00
ash 2bab9e4eba nixos/dokuwiki: factor out toPhpString 2024-09-07 15:30:54 +01:00
ash 345c8a7310 nixos/dokuwiki: don’t use lib.escapeShellArg
PHP strings don't obey shell quoting rules. See #333744.
2024-09-07 14:39:07 +01:00
stuebinm 6afb255d97 nixos: remove all uses of lib.mdDoc
these changes were generated with nixq 0.0.2, by running

  nixq ">> lib.mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> Inherit >> mdDoc[remove]" --batchmode nixos/**.nix

two mentions of the mdDoc function remain in nixos/, both of which
are inside of comments.

Since lib.mdDoc is already defined as just id, this commit is a no-op as
far as Nix (and the built manual) is concerned.
2024-04-13 10:07:35 -07:00
Jonas Heinrich d71dc05e82 nixos/dokuwiki: Remove old migration warnings 2024-01-09 20:51:12 +01:00
h7x4 0a37316d6c
treewide: use mkPackageOption
This commit replaces a lot of usages of `mkOption` with the package
type, to be `mkPackageOption`, in order to reduce the amount of code.
2023-11-27 01:28:36 +01:00
Thomas Gerbet 84c0cb1471 php: drop PHP 8.0
Closes #224505
2023-06-21 22:09:16 +02:00
figsoda 701bcdbead nixos: fix typos 2023-05-19 22:31:04 -04:00
Moritz 'e1mo' Fromm cc55cd6ab7
nixos/dokuwiki: Mark last descriptions as md 2023-04-14 18:12:48 +02:00
Moritz 'e1mo' Fromm e78f08fa21
nixos/dokuwiki: Finally remove extraConfig
After the introduction of structured settings in #208299 the old
string-style options  / types which were kept for compatibility are now
removed in preparation for the 23.05 release.
2023-04-14 18:12:42 +02:00
Moritz 'e1mo' Fromm e8b59a1e2e
nixos/dokuwiki: remove last reference to aclUse
This was overlooked in #209299, but will throw a trace when building a
system even when the setting was not set.
2023-02-11 11:12:51 +01:00
pennae bf4c0c1900 nixos/*: remove trailing period in mkEnableOptions
those are added by mkEnableOption, and .. is replaced to … by markdown
processing.
2023-02-08 15:23:34 +01:00
Ryan Lahfa eb6d457115
Merge pull request #209246 from e1mo/dokuwiki/package-overriding
dokuwiki: Combine mechanism for plugins and templates
2023-01-18 00:51:18 +01:00
Moritz 'e1mo' Fromm ee41b6b457
dokuwiki: Combine mechanism for plugins and templates
Copy templates and plugins into Dokuwiki instead of linking to address
template compatibility. As noted by @sinavir[^1], (some) templates would
fail due to relative PHP imports.

[^1]: https://github.com/NixOS/nixpkgs/pull/208299#issuecomment-1370413116
2023-01-06 23:52:49 +01:00
Moritz 'e1mo' Fromm 8d4251f491
nixos/dokuwiki: Add e1mo as maintainer 2023-01-06 23:40:09 +01:00
Moritz 'e1mo' Fromm 236d90fde0
nixos/dokuwiki: Overhaul for structured settings
Added the RFC42-style added the posibility to use
`services.dokuwiki.sites.<name>.settings' instead of passing a plain
string to `<name>.extraConfig`. ´<name>.pluginsConfig` now also accepts
structured configuration.
2023-01-06 22:02:37 +01:00
Jonas Heinrich 059e0f8958
Merge pull request #209316 from e1mo/dokuwiki/housekeeping
nixosTests.dokuwiki: Deduplicate node configuration
2023-01-06 21:10:50 +01:00
Moritz 'e1mo' Fromm 055100611d
nixos/dokuwiki: Simplify plugin fetching examples
Also replaced apache httpd referenced with ones to caddy
2023-01-06 15:12:47 +01:00
Moritz 'e1mo' Fromm 4649662802
nixos/dokuwiki: Take phpPackage and phpOptions 2023-01-06 01:09:46 +01:00
Emil Karlson 082bc22205 nixos/dokuwiki: Use stateDir everywhere
Current module does not use non-default stateDir everywhere.

Statedir has a consistent default, use the cfg.stateDir everywhere
unconditionally.
2022-10-22 09:02:23 +03:00
Jonas Heinrich bdd227c300
Merge pull request #184827 from onny/dokuwiki
dokuwiki: 2020-07-29 -> 2022-07-31
2022-09-04 19:08:45 +02:00
Jonas Heinrich 589ddec574 nixos/dokuwiki: Update module 2022-09-02 18:50:10 +02:00
pennae 1d41cff3dc nixos/*: convert straggler options to MD 2022-08-31 17:27:38 +02:00
pennae 722b99bc0e nixos/*: convert options with admonitions to MD
rendering changes only slightly, most changes are in spacing.
2022-08-31 16:36:16 +02:00
pennae ef176dcf7e nixos/*: automatically convert option descriptions
conversions were done using https://github.com/pennae/nix-doc-munge
using (probably) rev f34e145 running

    nix-doc-munge nixos/**/*.nix
    nix-doc-munge --import nixos/**/*.nix

the tool ensures that only changes that could affect the generated
manual *but don't* are committed, other changes require manual review
and are discarded.
2022-08-31 16:32:53 +02:00
pennae 61e93df189 nixos/*: automatically convert option docs to MD
once again using nix-doc-munge (69d080323a)
2022-08-03 22:46:41 +02:00
pennae 2e751c0772 treewide: automatically md-convert option descriptions
the conversion procedure is simple:

 - find all things that look like options, ie calls to either `mkOption`
   or `lib.mkOption` that take an attrset. remember the attrset as the
   option
 - for all options, find a `description` attribute who's value is not a
   call to `mdDoc` or `lib.mdDoc`
 - textually convert the entire value of the attribute to MD with a few
   simple regexes (the set from mdize-module.sh)
 - if the change produced a change in the manual output, discard
 - if the change kept the manual unchanged, add some text to the
   description to make sure we've actually found an option. if the
   manual changes this time, keep the converted description

this procedure converts 80% of nixos options to markdown. around 2000
options remain to be inspected, but most of those fail the "does not
change the manual output check": currently the MD conversion process
does not faithfully convert docbook tags like <code> and <package>, so
any option using such tags will not be converted at all.
2022-07-30 15:16:34 +02:00
Elis Hirwing f822b894c5
nixos/dokuwiki: Upgrade to PHP 8.1
They seem to run tests against 8.1 since this commit:
7aee97ee81
2022-06-08 18:08:59 +02:00
Sandro Jäckel ae66e2d5ec
treewide: use configured nginx package 2022-02-08 12:13:30 +01:00
Jonas Heinrich 884daaafcb nixos/dokuwiki: Minor code cleanup 2022-01-20 12:01:09 +01:00
Jonas Heinrich 75d417c267
nixos/dokuwiki: Drop deprecated old interface (#152676) 2022-01-16 02:38:20 +09:00
Daniel Olsen 1681c0b49e nixos/dokuwiki: Use php74 for the phpfpm pool
php8 does not work and is not supported
2021-12-08 20:22:12 +01:00
Jonas Heinrich 50029ed89c nixos/dokuwiki: add missing option enable 2021-11-02 09:23:06 +09:00
Naïm Favier 2ddc335e6f
nixos/doc: clean up defaults and examples 2021-10-04 12:47:20 +02:00
Jonas Heinrich 0dcac759f2 nixos/dokuwiki: Add support for Caddy web server 2021-09-18 23:09:21 +09:00
John Ericson f5a7d8bb41
Merge pull request #115228 from siraben/unzip-buildInputs
treewide: unzip buildInputs to nativeBuildInputs (2)
2021-03-06 13:30:43 -05:00
Ben Siraphob 4f0cdb68d7 treewide: unzip buldInputs to nativeBuildInputs (2) 2021-03-06 15:18:05 +07:00
taku0 61706fc470
Merge pull request #114853 from lourkeur/fix-string-escaping
nixos/kresd, nixos/dokuwiki, tests/fpm, build-bazel-package, libcutl: fix string escaping
2021-03-03 19:35:16 +09:00
volth bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
kvtb 2c7f09a78f
docuwiki.nix: fix string escaping
\. has no effect in single quoted strings
2020-12-31 23:49:55 +00:00
zowoq 0052523a18 maintainers: 1000101 -> _1000101 2020-08-18 07:59:48 +10:00
Aaron Andersen 4e3b009778
Merge pull request #94624 from dadada/dadada/dokuwiki-acl-path
nixos/dokuwiki: fix path to ACL
2020-08-05 07:28:12 -04:00
Marek Mahut 0bc37f7cb4
Merge pull request #94609 from 1000101/dokuwiki
nixos/dokuwiki: drop SSL forcing and document incompatibility
2020-08-05 11:54:42 +02:00