From 2c9bda0b63d066d969856cc345ffa3a66164d968 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sat, 20 Jan 2024 04:43:07 +0000
Subject: [PATCH] packages/axidraw: no more pythonFinal/pythonPrev

---
 flake.nix                    |  7 +++++--
 packages/axidraw/modules.nix | 12 ++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index f0d8b8b..2c15142 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,8 +53,11 @@
 
           pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
             (pythonFinal: pythonPrev:
-              (final.callPackage ./packages/axidraw/modules.nix {
-                inherit pythonFinal pythonPrev;
+              {
+                vpype =
+                  final.callPackage ./packages/vpype { python3 = pythonFinal; };
+              } // (final.callPackage ./packages/axidraw/modules.nix {
+                python3 = pythonFinal;
               }))
           ];
         };
diff --git a/packages/axidraw/modules.nix b/packages/axidraw/modules.nix
index 6007c75..17e88ef 100644
--- a/packages/axidraw/modules.nix
+++ b/packages/axidraw/modules.nix
@@ -1,6 +1,6 @@
-{ pythonFinal, pythonPrev, fetchPypi, fetchzip, fetchurl }:
+{ python3, fetchPypi, fetchzip, fetchurl }:
 let
-  inherit (pythonFinal) buildPythonPackage;
+  inherit (python3) buildPythonPackage;
 
   axicliVersion = "3.9.0";
   axicliVer = builtins.replaceStrings [ "." ] [ "" ] axicliVersion;
@@ -28,7 +28,7 @@ in {
       inherit pname version;
       hash = "sha256-9dPmoLBhIoJGBaQwOtGMZnOS9mGGel13dQXkaJdexyc=";
     };
-    propagatedBuildInputs = with pythonFinal; [ lxml ];
+    propagatedBuildInputs = with python3; [ lxml ];
   };
 
   plotink = buildPythonPackage rec {
@@ -39,7 +39,7 @@ in {
       hash = "sha256-YxSASXBNXqRyGp7x6jlTU0UYJHJkiKdlEzfDMzUtKXk=";
     };
     doCheck = false;
-    propagatedBuildInputs = with pythonFinal; [ ink-extensions pyserial ];
+    propagatedBuildInputs = with python3; [ ink-extensions pyserial ];
   };
 
   axidrawinternal = buildPythonPackage {
@@ -48,7 +48,7 @@ in {
     format = "wheel";
     src =
       "${axicliSrc}/prebuilt_dependencies/axidrawinternal-${axicliVersion}-py2.py3-none-any.whl";
-    propagatedBuildInputs = with pythonFinal; [
+    propagatedBuildInputs = with python3; [
       ink-extensions
       requests
       packaging
@@ -64,7 +64,7 @@ in {
     format = "setuptools";
     src = axicliSrc;
     doCheck = false;
-    propagatedBuildInputs = with pythonFinal; [
+    propagatedBuildInputs = with python3; [
       ink-extensions
       lxml
       plotink