artemist/packages
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

packages/axidraw: no more pythonFinal/pythonPrev

Browse source
This commit is contained in:
Artemis Tosini 2024-01-20 04:43:07 +00:00
parent f8477295a5
commit 2c9bda0b63
Signed by: artemist
GPG key ID: EE5227935FE3FF18
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
flake.nix
View file

@ -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;
}))
];
};

12
packages/axidraw/modules.nix
View file

@ -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