warcPackages: extract warctools from warcprox

3 files changed, 20 insertions, 11 deletions

diff --git a/pkgs/warcPackages/default.nix b/pkgs/warcPackages/default.nix
index 9374728..4ef80c2 100644
--- a/pkgs/warcPackages/default.nix
+++ b/pkgs/warcPackages/default.nix
@@ -4,6 +4,9 @@ lib.makeScope newScope (self: {
 
   wget-lua = self.callPackage ./wget-lua { };
   warcat = self.callPackage ./warcat { };
-  warcprox = self.callPackage ./warcprox { };
+  warctools = self.callPackage ./warctools { };
+  warcprox = self.callPackage ./warcprox {
+    inherit (self) warctools;
+  };
 
 })
diff --git a/pkgs/warcPackages/warcprox/default.nix b/pkgs/warcPackages/warcprox/default.nix
index 647fe21..9350558 100644
--- a/pkgs/warcPackages/warcprox/default.nix
+++ b/pkgs/warcPackages/warcprox/default.nix
@@ -4,6 +4,7 @@
   python3,
   python3Packages,
   stdenv,
+  warctools,
 }:
 
 let
@@ -45,16 +46,6 @@ let
         build-system = [ setuptools ];
         dependencies = [ idna ];
       });
-      warctools = (with python3Packages; buildPythonPackage rec {
-        pname = "warctools";
-        version = "5.0.1";
-        src = fetchPypi {
-          inherit pname version;
-          hash = "sha256-diHa4nNnPfnxsuosspLn+mbT7vprMCJp5FdAej++IY4=";
-        };
-        pyproject = true;
-        build-system = [ setuptools ];
-      });
     in
 python3Packages.buildPythonPackage rec {
   pname = "warcprox";
diff --git a/pkgs/warcPackages/warctools/default.nix b/pkgs/warcPackages/warctools/default.nix
new file mode 100644
index 0000000..6835d22
--- /dev/null
+++ b/pkgs/warcPackages/warctools/default.nix
@@ -0,0 +1,15 @@
+{
+  python3Packages,
+  fetchPypi,
+}:
+
+with python3Packages; buildPythonPackage rec {
+  pname = "warctools";
+  version = "5.0.1";
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-diHa4nNnPfnxsuosspLn+mbT7vprMCJp5FdAej++IY4=";
+  };
+  pyproject = true;
+  build-system = [ setuptools ];
+}