From 44037b25af32fb565ab1cbde13b6a443037d4643 Mon Sep 17 00:00:00 2001
From: Nina Fromm <nina.fromm@cyberus-technology.de>
Date: Mon, 28 Sep 2026 10:54:39 +0200
Subject: [PATCH 1/2] dokuwiki: move from rec to finalAttrs

---
 pkgs/by-name/do/dokuwiki/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/do/dokuwiki/package.nix b/pkgs/by-name/do/dokuwiki/package.nix
index 3059ee06e05a..7b842d6306e3 100644
--- a/pkgs/by-name/do/dokuwiki/package.nix
+++ b/pkgs/by-name/do/dokuwiki/package.nix
@@ -7,14 +7,14 @@
   dokuwiki,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dokuwiki";
   version = "2026-07-14c";
 
   src = fetchFromGitHub {
     owner = "dokuwiki";
     repo = "dokuwiki";
-    rev = "release-${version}";
+    rev = "release-${finalAttrs.version}";
     sha256 = "sha256-84kMuFTWYo6Cjd6qpkZsLZoECIP9IzSrc9dX1uKMp0M=";
   };
 
@@ -49,9 +49,9 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/share/dokuwiki
     cp -r * $out/share/dokuwiki
-    cp ${preload} $out/share/dokuwiki/inc/preload.php
-    cp ${phpLocalConfig} $out/share/dokuwiki/conf/local.php
-    cp ${phpPluginsLocalConfig} $out/share/dokuwiki/conf/plugins.local.php
+    cp ${finalAttrs.preload} $out/share/dokuwiki/inc/preload.php
+    cp ${finalAttrs.phpLocalConfig} $out/share/dokuwiki/conf/local.php
+    cp ${finalAttrs.phpPluginsLocalConfig} $out/share/dokuwiki/conf/plugins.local.php
 
     runHook postInstall
   '';
@@ -115,4 +115,4 @@ stdenv.mkDerivation rec {
       e1mo
     ];
   };
-}
+})

From 911885045fc1b6666d0f32d7bc5c4058a9b345f7 Mon Sep 17 00:00:00 2001
From: Nina Fromm <nina.fromm@cyberus-technology.de>
Date: Mon, 28 Sep 2026 10:54:53 +0200
Subject: [PATCH 2/2] dokuwiki: add correct CPE information

---
 pkgs/by-name/do/dokuwiki/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/do/dokuwiki/package.nix b/pkgs/by-name/do/dokuwiki/package.nix
index 7b842d6306e3..79a40f6b3ae2 100644
--- a/pkgs/by-name/do/dokuwiki/package.nix
+++ b/pkgs/by-name/do/dokuwiki/package.nix
@@ -110,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Only;
     homepage = "https://www.dokuwiki.org";
     platforms = lib.platforms.all;
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "dokuwiki" finalAttrs.version;
     maintainers = with lib.maintainers; [
       _1000101
       e1mo