From bfedb2cb1dc9032bdd885770aea6556ac91e7b13 Mon Sep 17 00:00:00 2001
From: klea
Date: Tue, 30 Dec 2025 17:13:50 +0000
Subject: pkgs: create wikiteam section

---
 pkgs/default.nix                          |  6 ++--
 pkgs/dokuwiki-dumper/default.nix          | 55 -------------------------------
 pkgs/shell/default.nix                    |  7 ++--
 pkgs/wikiteam/default.nix                 |  8 +++++
 pkgs/wikiteam/dokuwiki-dumper/default.nix | 55 +++++++++++++++++++++++++++++++
 pkgs/wikiteam/wikiteam3/default.nix       | 49 +++++++++++++++++++++++++++
 pkgs/wikiteam3/default.nix                | 49 ---------------------------
 7 files changed, 117 insertions(+), 112 deletions(-)
 delete mode 100644 pkgs/dokuwiki-dumper/default.nix
 create mode 100644 pkgs/wikiteam/default.nix
 create mode 100644 pkgs/wikiteam/dokuwiki-dumper/default.nix
 create mode 100644 pkgs/wikiteam/wikiteam3/default.nix
 delete mode 100644 pkgs/wikiteam3/default.nix

(limited to 'pkgs')

diff --git a/pkgs/default.nix b/pkgs/default.nix
index fc69a1f..54ee6a4 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -12,8 +12,7 @@ lib.makeScope newScope (self: {
     pywikibot = self.pywikibot;
     pywikibot-scripts = self.pywikibot-scripts;
   };
-  wikiteam3 = self.callPackage ./wikiteam3 { };
-  dokuwiki-dumper = self.callPackage ./dokuwiki-dumper { };
+  wikiteam = self.callPackage ./wikiteam { };
 
   little-things = self.callPackage ./little-things { };
 
@@ -21,8 +20,7 @@ lib.makeScope newScope (self: {
     little-things = self.little-things;
     pywb = self.pywb;
     pywikibot = self.pywikibot;
-    wikiteam3 = self.wikiteam3;
-    dokuwiki-dumper = self.dokuwiki-dumper;
+    wikiteam = self.wikiteam;
   };
 
 })
diff --git a/pkgs/dokuwiki-dumper/default.nix b/pkgs/dokuwiki-dumper/default.nix
deleted file mode 100644
index ba4dd2a..0000000
--- a/pkgs/dokuwiki-dumper/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3,
-  python3Packages,
-  stdenv,
-}:
-
-python3Packages.buildPythonPackage rec {
-  pname = "wikiteam3";
-  version = "0.2.4";
-  pyproject = true;
-  build-system = [ python3Packages.setuptools ];
-  propagatedBuildInputs = [
-    python3Packages.pdm-backend
-    python3Packages.requests
-    python3Packages.beautifulsoup4
-    python3Packages.lxml
-    python3Packages.internetarchive
-    python3Packages.rich
-    python3Packages.python-slugify
-    python3Packages.typing-extensions
-  ];
-
-  pythonRelaxDeps = [
-    "lxml"
-  ];
-
-  postPatch = ''
-    substituteInPlace dokuWikiDumper/dump/doku_dumper.py --replace-fail \
-      "avoidSites(doku_url, session=session)" \
-      "if not \"SW_IGAVS\" in os.environ.keys(): avoidSites(doku_url, session=session)"
-  '';
-
-  disabled = python3Packages.pythonOlder "3.8";
-
-  src = fetchFromGitHub {
-    owner = "saveweb";
-    repo = "dokuwiki-dumper";
-    rev = "83f1c8e0176c756476cf178f4ca784c338918254";
-    hash = "sha256-jMkhXcOuVSEwebRR3sH0jybCJfvoMTMnVBSXdzleHe4=";
-  };
-
-  #doCheck = false;
-
-  pythonImportsCheck = [ "dokuWikiDumper" "dokuWikiUploader" ];
-
-  meta = {
-    description = "A tool for archiving DokuWiki";
-    homepage = "https://github.com/saveweb/dokuwiki-dumper";
-    changelog = "https://github.com/saveweb/dokuwiki-dumper/tags";
-    license = lib.licenses.gpl3;
-    #maintainers = with lib.maintainers; [ ];
-  };
-}
diff --git a/pkgs/shell/default.nix b/pkgs/shell/default.nix
index 1b6ad3e..20592c1 100644
--- a/pkgs/shell/default.nix
+++ b/pkgs/shell/default.nix
@@ -1,5 +1,4 @@
 {
-  dokuwiki-dumper,
   fossil,
   git,
   internetarchive,
@@ -12,7 +11,7 @@
   pywb,
   pywikibot,
   websocat,
-  wikiteam3,
+  wikiteam,
   zlib,
   zstd,
 }:
@@ -33,7 +32,7 @@ mkShellNoCC {
     internetarchive # ia cmdline tool
     little-things
     (zstd.overrideAttrs(prev: { buildInputs = prev.buildInputs ++ [ zlib ]; cmakeFlags = prev.cmakeFlags ++ [ "-DZSTD_ZLIB_SUPPORT:BOOL=ON" ]; }))
-    wikiteam3
-    dokuwiki-dumper
+    wikiteam.wikiteam3
+    wikiteam.dokuwiki-dumper
   ];
 }
diff --git a/pkgs/wikiteam/default.nix b/pkgs/wikiteam/default.nix
new file mode 100644
index 0000000..5e89b00
--- /dev/null
+++ b/pkgs/wikiteam/default.nix
@@ -0,0 +1,8 @@
+{ lib, newScope }:
+
+lib.makeScope newScope (self: {
+
+  wikiteam3 = self.callPackage ./wikiteam3 { };
+  dokuwiki-dumper = self.callPackage ./dokuwiki-dumper { };
+
+})
diff --git a/pkgs/wikiteam/dokuwiki-dumper/default.nix b/pkgs/wikiteam/dokuwiki-dumper/default.nix
new file mode 100644
index 0000000..ba4dd2a
--- /dev/null
+++ b/pkgs/wikiteam/dokuwiki-dumper/default.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3,
+  python3Packages,
+  stdenv,
+}:
+
+python3Packages.buildPythonPackage rec {
+  pname = "wikiteam3";
+  version = "0.2.4";
+  pyproject = true;
+  build-system = [ python3Packages.setuptools ];
+  propagatedBuildInputs = [
+    python3Packages.pdm-backend
+    python3Packages.requests
+    python3Packages.beautifulsoup4
+    python3Packages.lxml
+    python3Packages.internetarchive
+    python3Packages.rich
+    python3Packages.python-slugify
+    python3Packages.typing-extensions
+  ];
+
+  pythonRelaxDeps = [
+    "lxml"
+  ];
+
+  postPatch = ''
+    substituteInPlace dokuWikiDumper/dump/doku_dumper.py --replace-fail \
+      "avoidSites(doku_url, session=session)" \
+      "if not \"SW_IGAVS\" in os.environ.keys(): avoidSites(doku_url, session=session)"
+  '';
+
+  disabled = python3Packages.pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "saveweb";
+    repo = "dokuwiki-dumper";
+    rev = "83f1c8e0176c756476cf178f4ca784c338918254";
+    hash = "sha256-jMkhXcOuVSEwebRR3sH0jybCJfvoMTMnVBSXdzleHe4=";
+  };
+
+  #doCheck = false;
+
+  pythonImportsCheck = [ "dokuWikiDumper" "dokuWikiUploader" ];
+
+  meta = {
+    description = "A tool for archiving DokuWiki";
+    homepage = "https://github.com/saveweb/dokuwiki-dumper";
+    changelog = "https://github.com/saveweb/dokuwiki-dumper/tags";
+    license = lib.licenses.gpl3;
+    #maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/wikiteam/wikiteam3/default.nix b/pkgs/wikiteam/wikiteam3/default.nix
new file mode 100644
index 0000000..0ad4ccd
--- /dev/null
+++ b/pkgs/wikiteam/wikiteam3/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3,
+  python3Packages,
+  stdenv,
+}:
+
+python3Packages.buildPythonPackage rec {
+  pname = "wikiteam3";
+  version = "4.4.7";
+  pyproject = true;
+  build-system = [ python3Packages.setuptools ];
+  propagatedBuildInputs = [
+    python3Packages.pdm-backend
+    python3Packages.requests
+    python3Packages.internetarchive
+    python3Packages.lxml
+    python3Packages.mwclient
+    python3Packages.file-read-backwards
+    python3Packages.python-slugify
+  ];
+
+  pythonRelaxDeps = [
+    "internetarchive"
+    "lxml"
+  ];
+
+  disabled = python3Packages.pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "saveweb";
+    repo = "wikiteam3";
+    rev = "7b03b21baccb482ff57c6e606d9c8ac6e88f4291";
+    hash = "sha256-67ozwogX9hCDzgF8sGvvSrtH6mvfIgPii6PORy0hGz8=";
+  };
+
+  #doCheck = false;
+
+  pythonImportsCheck = [ "wikiteam3" "wikiteam3.dumpgenerator" "wikiteam3.tools" "wikiteam3.uploader" "wikiteam3.utils" ];
+
+  meta = {
+    description = "archiving MediaWikis (and uploading wikidump to the Internet Archive)";
+    homepage = "https://github.com/saveweb/wikiteam3";
+    changelog = "https://github.com/saveweb/wikiteam3/tags";
+    license = lib.licenses.agpl3Plus;
+    #maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/wikiteam3/default.nix b/pkgs/wikiteam3/default.nix
deleted file mode 100644
index 0ad4ccd..0000000
--- a/pkgs/wikiteam3/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3,
-  python3Packages,
-  stdenv,
-}:
-
-python3Packages.buildPythonPackage rec {
-  pname = "wikiteam3";
-  version = "4.4.7";
-  pyproject = true;
-  build-system = [ python3Packages.setuptools ];
-  propagatedBuildInputs = [
-    python3Packages.pdm-backend
-    python3Packages.requests
-    python3Packages.internetarchive
-    python3Packages.lxml
-    python3Packages.mwclient
-    python3Packages.file-read-backwards
-    python3Packages.python-slugify
-  ];
-
-  pythonRelaxDeps = [
-    "internetarchive"
-    "lxml"
-  ];
-
-  disabled = python3Packages.pythonOlder "3.8";
-
-  src = fetchFromGitHub {
-    owner = "saveweb";
-    repo = "wikiteam3";
-    rev = "7b03b21baccb482ff57c6e606d9c8ac6e88f4291";
-    hash = "sha256-67ozwogX9hCDzgF8sGvvSrtH6mvfIgPii6PORy0hGz8=";
-  };
-
-  #doCheck = false;
-
-  pythonImportsCheck = [ "wikiteam3" "wikiteam3.dumpgenerator" "wikiteam3.tools" "wikiteam3.uploader" "wikiteam3.utils" ];
-
-  meta = {
-    description = "archiving MediaWikis (and uploading wikidump to the Internet Archive)";
-    homepage = "https://github.com/saveweb/wikiteam3";
-    changelog = "https://github.com/saveweb/wikiteam3/tags";
-    license = lib.licenses.agpl3Plus;
-    #maintainers = with lib.maintainers; [ ];
-  };
-}
-- 
cgit v1.3.1-10-gc9f91