Unverified Commit e7e169ca authored by Jonas Heinrich's avatar Jonas Heinrich Committed by GitHub
Browse files

Merge pull request #225883 from e1mo/dokuwiki-2023-04-04 

dokuwiki: 2022-07-31a -> 2023-04-04
parents 167731fc 8c2f6a1d

nixos/doc/manual/release-notes/rl-2305.section.md

+2 −0
Original line number Diff line number Diff line
@@ -192,6 +192,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.

pkgs/servers/web-apps/dokuwiki/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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" ''