pkgs: create wikiteam section

5 files changed, 13 insertions, 8 deletions

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/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/dokuwiki-dumper/default.nix b/pkgs/wikiteam/dokuwiki-dumper/default.nix
index ba4dd2a..ba4dd2a 100644
--- a/pkgs/dokuwiki-dumper/default.nix
+++ b/pkgs/wikiteam/dokuwiki-dumper/default.nix
diff --git a/pkgs/wikiteam3/default.nix b/pkgs/wikiteam/wikiteam3/default.nix
index 0ad4ccd..0ad4ccd 100644
--- a/pkgs/wikiteam3/default.nix
+++ b/pkgs/wikiteam/wikiteam3/default.nix