summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkgs/default.nix4
-rw-r--r--pkgs/pywikibotPackages/default.nix11
-rw-r--r--pkgs/pywikibotPackages/pywb/default.nix (renamed from pkgs/pywb/default.nix)0
-rw-r--r--pkgs/pywikibotPackages/pywikibot-scripts/default.nix (renamed from pkgs/pywikibot-scripts/default.nix)0
-rw-r--r--pkgs/pywikibotPackages/pywikibot-scripts/setup.py (renamed from pkgs/pywikibot-scripts/setup.py)0
-rw-r--r--pkgs/pywikibotPackages/pywikibot/default.nix (renamed from pkgs/pywikibot/default.nix)0
-rw-r--r--pkgs/shell/default.nix9
7 files changed, 16 insertions, 8 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4ab64e2..12db68a 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -4,9 +4,7 @@ lib.makeScope newScope (self: {
/*example = self.call Package ./example { };*/
- pywikibot-scripts = self.callPackage ./pywikibot-scripts { };
- pywikibot = self.callPackage ./pywikibot { };
- pywb = self.callPackage ./pywb { };
+ pywikibotPackages = self.callPackage ./pywikibotPackages { };
wikiteam = self.callPackage ./wikiteam { };
warcPackages = self.callPackage ./warcPackages { };
diff --git a/pkgs/pywikibotPackages/default.nix b/pkgs/pywikibotPackages/default.nix
new file mode 100644
index 0000000..9e22141
--- /dev/null
+++ b/pkgs/pywikibotPackages/default.nix
@@ -0,0 +1,11 @@
+{ lib, newScope }:
+
+lib.makeScope newScope (self: {
+
+ /*example = self.call Package ./example { };*/
+
+ pywikibot-scripts = self.callPackage ./pywikibot-scripts { };
+ pywikibot = self.callPackage ./pywikibot { };
+ pywb = self.callPackage ./pywb { };
+
+})
diff --git a/pkgs/pywb/default.nix b/pkgs/pywikibotPackages/pywb/default.nix
index 604f92e..604f92e 100644
--- a/pkgs/pywb/default.nix
+++ b/pkgs/pywikibotPackages/pywb/default.nix
diff --git a/pkgs/pywikibot-scripts/default.nix b/pkgs/pywikibotPackages/pywikibot-scripts/default.nix
index 1d12d42..1d12d42 100644
--- a/pkgs/pywikibot-scripts/default.nix
+++ b/pkgs/pywikibotPackages/pywikibot-scripts/default.nix
diff --git a/pkgs/pywikibot-scripts/setup.py b/pkgs/pywikibotPackages/pywikibot-scripts/setup.py
index b37eb2e..b37eb2e 100644
--- a/pkgs/pywikibot-scripts/setup.py
+++ b/pkgs/pywikibotPackages/pywikibot-scripts/setup.py
diff --git a/pkgs/pywikibot/default.nix b/pkgs/pywikibotPackages/pywikibot/default.nix
index 55aac46..55aac46 100644
--- a/pkgs/pywikibot/default.nix
+++ b/pkgs/pywikibotPackages/pywikibot/default.nix
diff --git a/pkgs/shell/default.nix b/pkgs/shell/default.nix
index 1527952..7d19eb1 100644
--- a/pkgs/shell/default.nix
+++ b/pkgs/shell/default.nix
@@ -8,8 +8,7 @@
mkShellNoCC,
python3,
python3Packages,
- pywb,
- pywikibot,
+ pywikibotPackages,
warcPackages,
websocat,
wikiteam,
@@ -22,10 +21,10 @@ mkShellNoCC {
(python3.withPackages (p: [
p.requests
p.lxml
- pywikibot
+ pywikibotPackages.pywikibot
]))
- pywikibot
- pywb
+ pywikibotPackages.pywikibot
+ pywikibotPackages.pywb
websocat # connect to websocket
jq
libfaketime # used by my fossil script