summary refs log tree commit diff
diff options
context:
space:
mode:
authorMoritz 'e1mo' Fromm <git@e1mo.de>2023-04-12 13:03:33 +0200
committerMoritz 'e1mo' Fromm <git@e1mo.de>2023-04-15 10:41:32 +0200
commit8c2f6a1d9e21236251dfde2e9ae0a23ab9266e38 (patch)
treee3cdba24e242bfcad47de78e89aeb5d6bfd73f39
parentda30065bc8295da77ee414efe9fe0427b8779a62 (diff)
downloadnixpkgs-8c2f6a1d9e21236251dfde2e9ae0a23ab9266e38.tar
nixpkgs-8c2f6a1d9e21236251dfde2e9ae0a23ab9266e38.tar.gz
nixpkgs-8c2f6a1d9e21236251dfde2e9ae0a23ab9266e38.tar.bz2
nixpkgs-8c2f6a1d9e21236251dfde2e9ae0a23ab9266e38.tar.lz
nixpkgs-8c2f6a1d9e21236251dfde2e9ae0a23ab9266e38.tar.xz
nixpkgs-8c2f6a1d9e21236251dfde2e9ae0a23ab9266e38.tar.zst
nixpkgs-8c2f6a1d9e21236251dfde2e9ae0a23ab9266e38.zip
dokuwiki: 2022-07-31a -> 2023-04-04
See changelog at
<https://www.dokuwiki.org/changes#release_2023-04-04_jack_jackrum> for
list of (significant) changes.
-rw-r--r--nixos/doc/manual/release-notes/rl-2305.section.md2
-rw-r--r--pkgs/servers/web-apps/dokuwiki/default.nix8
2 files changed, 6 insertions, 4 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index 8b7cb61855b..86c60313bb4 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -168,6 +168,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `lib.systems.examples.ghcjs` and consequently `pkgsCross.ghcjs` now use the target triplet `javascript-unknown-ghcjs` instead of `js-unknown-ghcjs`. This has been done to match an [upstream decision](https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c) to follow Cabal's platform naming more closely. Nixpkgs will also reject `js` as an architecture name.
 
+- `dokuwiki` has been updated from 2023-07-31a (Igor) to 2023-04-04 (Jack Jackrum), which has [completely removed](https://www.dokuwiki.org/changes#release_2023-04-04_jack_jackrum) the options to embed HTML and PHP for security reasons. The [htmlok plugin](https://www.dokuwiki.org/plugin:htmlok) can be used to regain this functionality.
+
 - The old unsupported version 6.x of the ELK-stack and Elastic beats have been removed. Use OpenSearch instead.
 
 - The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead.
diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix
index b3a485113fa..888ca6ca239 100644
--- a/pkgs/servers/web-apps/dokuwiki/default.nix
+++ b/pkgs/servers/web-apps/dokuwiki/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dokuwiki";
-  version = "2022-07-31a";
+  version = "2023-04-04";
 
   src = fetchFromGitHub {
-    owner = "splitbrain";
+    owner = "dokuwiki";
     repo = pname;
-    rev = "release_stable_${version}";
-    sha256 = "sha256-gtWEtc3kbMokKycTx71XXblkDF39i926uN2kU3oOeVw=";
+    rev = "release-${version}";
+    sha256 = "sha256-QJnXKsEhvEcE88wvfMZR2j7X/pW8+28zlEnxhvhl+44=";
   };
 
   preload = writeText "preload.php" ''