grab-site, ludios_wpull: fix callPackage invocation

NixOS · Jun 30, 2024 · d147bd7 · d147bd7
1 parent 5aa91a4
commit d147bd7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 22 deletions.
diff --git a/pkgs/by-name/gr/grab-site/package.nix b/pkgs/by-name/gr/grab-site/package.nix
@@ -1,11 +1,9 @@
 { lib
-, fetchPypi
 , fetchFromGitHub
-, buildPythonApplication
-, python
-, pythonOlder
+, python3
 , ludios_wpull
 }:
+with python3.pkgs;
 buildPythonApplication rec {
   pname = "grab-site";
   version = "2.2.7";
@@ -24,7 +22,7 @@ buildPythonApplication rec {
       --replace-fail '"wpull @ https://github.com/ArchiveTeam/ludios_wpull/tarball/master#egg=wpull-3.0.9"' '"wpull"'
   '';
 
-  propagatedBuildInputs = with python.pkgs; [
+  propagatedBuildInputs = [
     click
     ludios_wpull
     manhole

diff --git a/pkgs/by-name/lu/ludios_wpull/package.nix b/pkgs/by-name/lu/ludios_wpull/package.nix
@@ -1,19 +1,6 @@
 { lib
-, buildPythonApplication
 , fetchFromGitHub
-, fetchPypi
-, chardet
-, dnspython
-, html5-parser
-, lxml
-, namedlist
-, psutil
-, setuptools
-, sqlalchemy
-, tornado
-, yapsy
-, python
-, pythonOlder
+, python3
 # Override Python packages using
 # self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); }
 # Applied after defaultOverrides
@@ -34,7 +21,7 @@ let
       });
     })
   ];
-  py = python.override {
+  py = python3.override {
     # Put packageOverrides at the start so they are applied after defaultOverrides
     packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);
   };

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -8532,7 +8532,9 @@ with pkgs;
 
   gql = callPackage ../applications/version-management/gql { };
 
-  grab-site = python312Packages.callPackage ../by-name/gr/grab-site/package.nix { };
+  grab-site = callPackage ../by-name/gr/grab-site/package.nix {
+    python3 = python312;
+  };
 
   grafterm = callPackage ../tools/misc/grafterm { };
 
@@ -8714,7 +8716,9 @@ with pkgs;
 
   lucky-cli = callPackage ../development/web/lucky-cli { };
 
-  ludios_wpull = python312Packages.callPackage ../by-name/lu/ludios_wpull/package.nix { };
+  ludios_wpull = callPackage ../by-name/lu/ludios_wpull/package.nix {
+    python3 = python312;
+  };
 
   mac-fdisk = callPackage ../tools/system/mac-fdisk { };