pkgs: try to conform to <https://nix.dev/guides/best-practices.html#with-scopes>

3 files changed, 25 insertions, 29 deletions

diff --git a/pkgs/warcPackages/warcprox/default.nix b/pkgs/warcPackages/warcprox/default.nix
index 9350558..9896620 100644
--- a/pkgs/warcPackages/warcprox/default.nix
+++ b/pkgs/warcPackages/warcprox/default.nix
@@ -8,44 +8,44 @@
 }:
 
 let
-  rethinkdb = (with python3Packages; buildPythonPackage rec {
+  rethinkdb = python3Packages.buildPythonPackage rec {
     pname = "rethinkdb";
     version = "2.4.10.post1";
-    src = fetchPypi {
+    src = python3Packages.fetchPypi {
       inherit pname version;
       hash = "sha256-NjTgPuE91jf9cZa4BHS/RMZNProd0GnqkrlJJnAqYL0=";
     };
     pyproject = true;
-    build-system = [ setuptools ];
-    dependencies = [ six looseversion ];
-  });
+    build-system = [ python3Packages.setuptools ];
+    dependencies = [ python3Packages.six python3Packages.looseversion ];
+  };
   in
     let
-      doublethink = (with python3Packages; buildPythonPackage rec {
+      doublethink = python3Packages.buildPythonPackage rec {
         pname = "doublethink";
         version = "0.4.10";
-        src = fetchPypi {
+        src = python3Packages.fetchPypi {
           inherit pname version;
           hash = "sha256-8rtseqS7sk6idcqkDrDKGppPO9+xwk9yqWl6l0fuuQM=";
         };
         pyproject = true;
-        build-system = [ setuptools ];
+        build-system = [ python3Packages.setuptools ];
         dependencies = [ rethinkdb ];
         pythonRelaxDeps = [
           "rethinkdb"
         ];
-      });
-      urlcanon = (with python3Packages; buildPythonPackage rec {
+      };
+      urlcanon = python3Packages.buildPythonPackage rec {
         pname = "urlcanon";
         version = "0.3.1";
-        src = fetchPypi {
+        src = python3Packages.fetchPypi {
           inherit pname version;
           hash = "sha256-MPW/Di5KD+tt2e4TmkGApdSTEX6KFEhWnaPXPBi5K2I=";
         };
         pyproject = true;
-        build-system = [ setuptools ];
-        dependencies = [ idna ];
-      });
+        build-system = [ python3Packages.setuptools ];
+        dependencies = [ python3Packages.idna ];
+      };
     in
 python3Packages.buildPythonPackage rec {
   pname = "warcprox";
@@ -63,16 +63,13 @@ python3Packages.buildPythonPackage rec {
     python3Packages.setuptools
   ];
 
-  dependencies = (with python3Packages; [
-    requests
-    pyyaml
-    rfc3986
-    cachetools
-    #doublethink
-    #urlcanon
-    pysocks
-    cryptography
-  ]) ++ [
+  dependencies = [
+    python3Packages.requests
+    python3Packages.pyyaml
+    python3Packages.rfc3986
+    python3Packages.cachetools
+    python3Packages.pysocks
+    python3Packages.cryptography
     doublethink
     rethinkdb
     urlcanon
diff --git a/pkgs/warcPackages/warctools/default.nix b/pkgs/warcPackages/warctools/default.nix
index 6835d22..4a675fe 100644
--- a/pkgs/warcPackages/warctools/default.nix
+++ b/pkgs/warcPackages/warctools/default.nix
@@ -3,13 +3,13 @@
   fetchPypi,
 }:
 
-with python3Packages; buildPythonPackage rec {
+python3Packages.buildPythonPackage rec {
   pname = "warctools";
   version = "5.0.1";
-  src = fetchPypi {
+  src = python3Packages.fetchPypi {
     inherit pname version;
     hash = "sha256-diHa4nNnPfnxsuosspLn+mbT7vprMCJp5FdAej++IY4=";
   };
   pyproject = true;
-  build-system = [ setuptools ];
+  build-system = [ python3Packages.setuptools ];
 }
diff --git a/pkgs/zygolophodon/default.nix b/pkgs/zygolophodon/default.nix
index 99d8496..2531128 100644
--- a/pkgs/zygolophodon/default.nix
+++ b/pkgs/zygolophodon/default.nix
@@ -6,13 +6,12 @@
   stdenv,
 }:
 
-with python3Packages;
 buildPythonPackage rec {
   pname = "zygolophodon";
   version = "0-unstable-2025-10-14";
 
   pyproject = true;
-  build-system = [ setuptools ];
+  build-system = [ python3Packages.setuptools ];
 
   src = fetchFromGitHub {
     owner = "jwilk";