Apply suggestions from code review

Co-authored-by: sephi <sylvain@fankhauser.name>

Author: jocelynthode

flake.nix

@@ -28,19 +28,14 @@
         fetchFromGitHub = pkgs.fetchFromGitHub;
       };
 
-      pythonVersions = ["python310" "python311" "python312" "python313"];
+      pythonVersions = ["310" "311" "312" "313"];
 
-      makeCheckForPython = pythonName:
-        pkgs.callPackage ./tests.nix {
-          python3 = pkgs.${pythonName};
-          taxi =
-            (import ./pkgs.nix {
-              inherit pkgs;
-              lib = pkgs.lib;
-              fetchFromGitHub = pkgs.fetchFromGitHub;
-              makeWrapper = pkgs.makeWrapper;
-              python3 = pkgs.${pythonName};
-            }).taxi;
+      makeCheckForPython = pythonVersion:
+        let
+          python3 = pkgs."python${pythonVersion}";
+        in pkgs.callPackage ./tests.nix {
+          inherit python3;
+          inherit (pkgs.callPackage ./pkgs.nix { inherit python3; }) taxi;
         };
 
       checksForPython = builtins.listToAttrs (map (py: {
@@ -63,13 +58,7 @@
     })
     // {
       overlays.default = final: prev: {
-        taxi-cli = import ./pkgs.nix {
-          lib = final.lib;
-          python3 = final.python3;
-          fetchFromGitHub = final.fetchFromGitHub;
-          makeWrapper = final.makeWrapper;
-          pkgs = final;
-        };
+        taxi-cli = final.callPackage ./pkgs.nix { };
       };
     };
 }

shell.nix

@@ -7,12 +7,6 @@ pkgs.mkShell {
     pkgs.python3
     pkgs.python3Packages.pip
     pkgs.makeWrapper
-    (pkgs.callPackage ./pkgs.nix {
-      lib = pkgs.lib;
-      python3 = pkgs.python3;
-      makeWrapper = pkgs.makeWrapper;
-      fetchFromGitHub = pkgs.fetchFromGitHub;
-      pkgs = pkgs;
-    }).taxi
+    (pkgs.callPackage ./pkgs.nix { }).taxi
   ];
 }