packages/axidraw: no more pythonFinal/pythonPrev
This commit is contained in:
parent
f8477295a5
commit
2c9bda0b63
|
@ -53,8 +53,11 @@
|
||||||
|
|
||||||
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
|
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
|
||||||
(pythonFinal: pythonPrev:
|
(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;
|
||||||
}))
|
}))
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ pythonFinal, pythonPrev, fetchPypi, fetchzip, fetchurl }:
|
{ python3, fetchPypi, fetchzip, fetchurl }:
|
||||||
let
|
let
|
||||||
inherit (pythonFinal) buildPythonPackage;
|
inherit (python3) buildPythonPackage;
|
||||||
|
|
||||||
axicliVersion = "3.9.0";
|
axicliVersion = "3.9.0";
|
||||||
axicliVer = builtins.replaceStrings [ "." ] [ "" ] axicliVersion;
|
axicliVer = builtins.replaceStrings [ "." ] [ "" ] axicliVersion;
|
||||||
|
@ -28,7 +28,7 @@ in {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-9dPmoLBhIoJGBaQwOtGMZnOS9mGGel13dQXkaJdexyc=";
|
hash = "sha256-9dPmoLBhIoJGBaQwOtGMZnOS9mGGel13dQXkaJdexyc=";
|
||||||
};
|
};
|
||||||
propagatedBuildInputs = with pythonFinal; [ lxml ];
|
propagatedBuildInputs = with python3; [ lxml ];
|
||||||
};
|
};
|
||||||
|
|
||||||
plotink = buildPythonPackage rec {
|
plotink = buildPythonPackage rec {
|
||||||
|
@ -39,7 +39,7 @@ in {
|
||||||
hash = "sha256-YxSASXBNXqRyGp7x6jlTU0UYJHJkiKdlEzfDMzUtKXk=";
|
hash = "sha256-YxSASXBNXqRyGp7x6jlTU0UYJHJkiKdlEzfDMzUtKXk=";
|
||||||
};
|
};
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
propagatedBuildInputs = with pythonFinal; [ ink-extensions pyserial ];
|
propagatedBuildInputs = with python3; [ ink-extensions pyserial ];
|
||||||
};
|
};
|
||||||
|
|
||||||
axidrawinternal = buildPythonPackage {
|
axidrawinternal = buildPythonPackage {
|
||||||
|
@ -48,7 +48,7 @@ in {
|
||||||
format = "wheel";
|
format = "wheel";
|
||||||
src =
|
src =
|
||||||
"${axicliSrc}/prebuilt_dependencies/axidrawinternal-${axicliVersion}-py2.py3-none-any.whl";
|
"${axicliSrc}/prebuilt_dependencies/axidrawinternal-${axicliVersion}-py2.py3-none-any.whl";
|
||||||
propagatedBuildInputs = with pythonFinal; [
|
propagatedBuildInputs = with python3; [
|
||||||
ink-extensions
|
ink-extensions
|
||||||
requests
|
requests
|
||||||
packaging
|
packaging
|
||||||
|
@ -64,7 +64,7 @@ in {
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
src = axicliSrc;
|
src = axicliSrc;
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
propagatedBuildInputs = with pythonFinal; [
|
propagatedBuildInputs = with python3; [
|
||||||
ink-extensions
|
ink-extensions
|
||||||
lxml
|
lxml
|
||||||
plotink
|
plotink
|
||||||
|
|
Loading…
Reference in a new issue