9 files changed, 104 insertions, 47 deletions
diff --git a/flakes/etherpad-lite/flake.lock b/flakes/etherpad-lite/flake.lock
index 3295c28..11785c8 100644
--- a/flakes/etherpad-lite/flake.lock
+++ b/flakes/etherpad-lite/flake.lock
@@ -58,7 +58,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../mypackages",
        "type": "path"
      },
diff --git a/flakes/flake.lock b/flakes/flake.lock
index b954e98..43c257e 100644
--- a/flakes/flake.lock
+++ b/flakes/flake.lock
@@ -3016,7 +3016,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../../mypackages",
        "type": "path"
      },
@@ -3033,7 +3033,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../mypackages",
        "type": "path"
      },
@@ -3050,7 +3050,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../mypackages",
        "type": "path"
      },
@@ -3067,7 +3067,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../../mypackages",
        "type": "path"
      },
@@ -3084,7 +3084,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../mypackages",
        "type": "path"
      },
@@ -3101,7 +3101,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../../mypackages",
        "type": "path"
      },
@@ -3118,7 +3118,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../../mypackages",
        "type": "path"
      },
@@ -3135,7 +3135,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../mypackages",
        "type": "path"
      },
@@ -3152,7 +3152,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../mypackages",
        "type": "path"
      },
@@ -3169,7 +3169,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../mypackages",
        "type": "path"
      },
@@ -3186,7 +3186,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../../mypackages",
        "type": "path"
      },
@@ -3203,7 +3203,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../../mypackages",
        "type": "path"
      },
@@ -3220,7 +3220,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../../mypackages",
        "type": "path"
      },
@@ -3753,7 +3753,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-TxR75+H0GF5b7jczbvnQi1FltOmOQctMaW5o2Zd7aUI=",
+        "narHash": "sha256-tES2TmrQIYifZ/6Sdf2I1n7SPdckEJPRaDXsNNAHrbQ=",
        "path": "../systems/backup-2",
        "type": "path"
      },
@@ -3776,7 +3776,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-w85YTOSyrw/C1rEp0O9jAONCKbuiHej3Q95OU21WNKo=",
+        "narHash": "sha256-sFGPhENPE1/3SVYWqwOH8P8GjwUR0wPd9572w+Asxmo=",
        "path": "../systems/dilion",
        "type": "path"
      },
@@ -3824,7 +3824,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-rJy4sjNt6TIB+FhVEbAWEXcRq0vm0IV0PiDJKy9BHC0=",
+        "narHash": "sha256-dX4Z5BYOn5R0RPUNLUGUfDf2csJic+lC/k1SHtp+kR0=",
        "path": "../systems/eldiron",
        "type": "path"
      },
@@ -3850,7 +3850,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-yfTJOJJc+bOYgXNcY1ardOEfpT+lRSojgiHi68LKgqU=",
+        "narHash": "sha256-r7yQaZe7ojo2nlLgbgQnXHqi194q4fN9VZHR5EGcYV4=",
        "path": "../systems/monitoring-1",
        "type": "path"
      },
@@ -3875,7 +3875,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-cbrcKbfMRDK4ukn4FpwwfVNtK0JZF0pr8s1PFm1AEyY=",
+        "narHash": "sha256-DjyZ+Dt/aR6Vc97ypTwVMbEweSQnQ43kHfTIcppOd8M=",
        "path": "../systems/quatresaisons",
        "type": "path"
      },
@@ -3895,7 +3895,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-2w+JMDIUudMpqNQ5IJhrSRlY8EDAOaf+sBfYUSGfepY=",
+        "narHash": "sha256-acODJQsPL2NMxEWVSyLTYdoeg3ikseGiNlnKYqeOd6Q=",
        "path": "../systems/zoldene",
        "type": "path"
      },
@@ -7499,7 +7499,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-ufaclDTTnoB7xLOCOY4EretrBp70rSmk0YzcVfglbLA=",
+        "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=",
        "path": "../../flakes/private/system",
        "type": "path"
      },
@@ -7518,7 +7518,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-ufaclDTTnoB7xLOCOY4EretrBp70rSmk0YzcVfglbLA=",
+        "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=",
        "path": "../../flakes/private/system",
        "type": "path"
      },
@@ -7571,7 +7571,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-0RN3EjVLumRs4/CYgYA1+UQecq+LyzrUJI6SpGHN/50=",
+        "narHash": "sha256-WmYq012p6U6KrAR1G+zyto8x0iCNqBMHmMgcdHu2o1o=",
        "path": "../../flakes/etherpad-lite",
        "type": "path"
      },
@@ -7613,7 +7613,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-0j7YmFwrbLg3FKeAcZApJ240cpt6uhiEEZt5v52QN5Q=",
+        "narHash": "sha256-OziOtTgYe7QbdiOLjPcBLLAfBX9HXaEeTiw1yCZFyTI=",
        "path": "../../flakes/grocy",
        "type": "path"
      },
@@ -7694,7 +7694,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../../flakes/mypackages",
        "type": "path"
      },
@@ -7817,7 +7817,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-SaZuUdU7estQQxxOhZ0mRyaQHK3AnlCUo/lTP8MFBao=",
+        "narHash": "sha256-PnXbm79feLDlquMaAFoevudYnu2deMutFLbpzd1/XxA=",
        "path": "../../flakes/surfer",
        "type": "path"
      },
@@ -7962,7 +7962,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-0RN3EjVLumRs4/CYgYA1+UQecq+LyzrUJI6SpGHN/50=",
+        "narHash": "sha256-WmYq012p6U6KrAR1G+zyto8x0iCNqBMHmMgcdHu2o1o=",
        "path": "./etherpad-lite",
        "type": "path"
      },
@@ -8004,7 +8004,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-0j7YmFwrbLg3FKeAcZApJ240cpt6uhiEEZt5v52QN5Q=",
+        "narHash": "sha256-OziOtTgYe7QbdiOLjPcBLLAfBX9HXaEeTiw1yCZFyTI=",
        "path": "./grocy",
        "type": "path"
      },
@@ -8104,7 +8104,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "./mypackages",
        "type": "path"
      },
@@ -8409,7 +8409,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-ufaclDTTnoB7xLOCOY4EretrBp70rSmk0YzcVfglbLA=",
+        "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=",
        "path": "./private/system",
        "type": "path"
      },
@@ -8451,7 +8451,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-SaZuUdU7estQQxxOhZ0mRyaQHK3AnlCUo/lTP8MFBao=",
+        "narHash": "sha256-PnXbm79feLDlquMaAFoevudYnu2deMutFLbpzd1/XxA=",
        "path": "./surfer",
        "type": "path"
      },
@@ -9015,7 +9015,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-ufaclDTTnoB7xLOCOY4EretrBp70rSmk0YzcVfglbLA=",
+        "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=",
        "path": "../../flakes/private/system",
        "type": "path"
      },
@@ -9034,7 +9034,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-ufaclDTTnoB7xLOCOY4EretrBp70rSmk0YzcVfglbLA=",
+        "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=",
        "path": "../../flakes/private/system",
        "type": "path"
      },
@@ -9053,7 +9053,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-ufaclDTTnoB7xLOCOY4EretrBp70rSmk0YzcVfglbLA=",
+        "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=",
        "path": "../../flakes/private/system",
        "type": "path"
      },
@@ -9072,7 +9072,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-ufaclDTTnoB7xLOCOY4EretrBp70rSmk0YzcVfglbLA=",
+        "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=",
        "path": "../../flakes/private/system",
        "type": "path"
      },
diff --git a/flakes/grocy/flake.lock b/flakes/grocy/flake.lock
index 0be1119..3bce1fc 100644
--- a/flakes/grocy/flake.lock
+++ b/flakes/grocy/flake.lock
@@ -58,7 +58,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../mypackages",
        "type": "path"
      },
diff --git a/flakes/mypackages/pkgs/webapps/mantisbt_2/default.nix b/flakes/mypackages/pkgs/webapps/mantisbt_2/default.nix
index 466595d..942e32c 100644
--- a/flakes/mypackages/pkgs/webapps/mantisbt_2/default.nix
+++ b/flakes/mypackages/pkgs/webapps/mantisbt_2/default.nix
@@ -1,6 +1,6 @@
 { mantis_config ? "/etc/mantisbt/config_inc.php", stdenv, fetchurl, lib, callPackage}:
 let
-  pluginNames = [ "slack" "source-integration" ];
+  pluginNames = [ "slack" "source-integration" "taskodrome" "mantis-kanban" "tasks" ];
  allPlugins = lib.attrsets.genAttrs pluginNames
    (name: callPackage (./plugins + "/${name}") {});
  toPassthru = pkg: plugins: {
@@ -23,17 +23,18 @@ let
    in newMantisbt;
  package = stdenv.mkDerivation rec {
    name = "mantisbt-${version}";
-    version = "2.21.0";
+    version = "2.26.1";
    src = fetchurl {
      url = "https://downloads.sourceforge.net/project/mantisbt/mantis-stable/${version}/${name}.tar.gz";
-      sha256 = "13lx569dp1gibq5daqp7dj6gsqic85rrix1s7xkp60gwpzk8wiw5";
+      sha256 = "sha256-poJCEjq+yB2RbA0k5go899mBGBXewjLZHGFmabrCYW4=";
    };
-    patches = [
+    # FIXME: captcha for anonymous
-      ./bug_report.php.diff
+    #patches = [
-      ./bug_report_page.php.diff
+    #  ./bug_report.php.diff
-      ./bugnote_add.php.diff
+    #  ./bug_report_page.php.diff
-      ./bugnote_add_inc.php.diff
+    #  ./bugnote_add.php.diff
-    ];
+    #  ./bugnote_add_inc.php.diff
+    #];
    installPhase = ''
    cp -a . $out
    ln -s ${mantis_config} $out/config/config_inc.php
diff --git a/flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/mantis-kanban/default.nix b/flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/mantis-kanban/default.nix
new file mode 100644
index 0000000..1d51705
--- /dev/null
+++ b/flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/mantis-kanban/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+  version = "v2.1.0";
+  name = "mantisbt-plugin-kanban-${version}";
+  src = fetchFromGitHub {
+    owner = "mantisbt-plugins";
+    repo = "MantisKanban";
+    rev = "62c3815578cab8a7766580049c3a4f5968331231";
+    sha256 = "sha256-wvinh7+QjsCEk05LHCL1KfTy/3+PvnVYwduHq2hlQP0=";
+  };
+  installPhase = ''
+    mkdir $out
+    cp -a * $out/
+    '';
+  passthru = {
+    pluginName = "MantisKanban";
+  };
+}
diff --git a/flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/taskodrome/default.nix b/flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/taskodrome/default.nix
new file mode 100644
index 0000000..dcf0d93
--- /dev/null
+++ b/flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/taskodrome/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+  version = "v2.1.8";
+  name = "mantisbt-plugin-taskodrome-${version}";
+  src = fetchFromGitHub {
+    owner = "mantisbt-plugins";
+    repo = "Taskodrome";
+    rev = "d8e24a0991f58a902c6c5cf9e88132a17ad533ac";
+    sha256 = "sha256-Jp2ROIjcSFTtGC58sDUg4FaB3mOKbY3GGpnIQqSpUaY=";
+  };
+  installPhase = ''
+    mkdir $out
+    cp -a Taskodrome $out/
+    '';
+  passthru = {
+    pluginName = "Taskodrome";
+    selector = "Taskodrome";
+  };
+}
diff --git a/flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/tasks/default.nix b/flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/tasks/default.nix
new file mode 100644
index 0000000..fe842f4
--- /dev/null
+++ b/flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/tasks/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+  version = "v3.30";
+  name = "mantisbt-plugin-tasks-${version}";
+  src = fetchFromGitHub {
+    owner = "mantisbt-plugins";
+    repo = "Tasks";
+    rev = "38d8255aa989b914ec0730e58ca73708d07f35c3";
+    sha256 = "sha256-QDMa8ar/FEpJCSH1D9LEaXSDR+WRkDx3stXm2+LKO0Q=";
+  };
+  installPhase = ''
+    mkdir $out
+    cp -a * $out/
+    '';
+  passthru = {
+    pluginName = "Tasks";
+  };
+}
diff --git a/flakes/private/system/flake.lock b/flakes/private/system/flake.lock
index ec1b023..2d0c0da 100644
--- a/flakes/private/system/flake.lock
+++ b/flakes/private/system/flake.lock
@@ -69,7 +69,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../../mypackages",
        "type": "path"
      },
diff --git a/flakes/surfer/flake.lock b/flakes/surfer/flake.lock
index 2c947a2..14201e2 100644
--- a/flakes/surfer/flake.lock
+++ b/flakes/surfer/flake.lock
@@ -41,7 +41,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
+        "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=",
        "path": "../mypackages",
        "type": "path"
      },