python3Packages.cadquery: 2.0RC0 -> 2.0
This commit is contained in:
parent
e98903af05
commit
be00210050
@ -2,6 +2,7 @@
|
|||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, isPy3k
|
, isPy3k
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
|
, pythonAtLeast
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, pyparsing
|
, pyparsing
|
||||||
, opencascade
|
, opencascade
|
||||||
@ -16,6 +17,9 @@
|
|||||||
, libGLU
|
, libGLU
|
||||||
, libX11
|
, libX11
|
||||||
, six
|
, six
|
||||||
|
, pytest
|
||||||
|
, makeFontsConf
|
||||||
|
, freefont_ttf
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -63,13 +67,13 @@ let
|
|||||||
in
|
in
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "cadquery";
|
pname = "cadquery";
|
||||||
version = "2.0RC0";
|
version = "2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "CadQuery";
|
owner = "CadQuery";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1xgd00rih0gjcnlrf9s6r5a7ypjkzgf2xij2b6436i76h89wmir3";
|
sha256 = "1n63b6cjjrdwdfmwq0zx1xabjnhndk9mgfkm4w7z9ardcfpvg84l";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
@ -81,8 +85,15 @@ in
|
|||||||
pythonocc-core-cadquery
|
pythonocc-core-cadquery
|
||||||
];
|
];
|
||||||
|
|
||||||
# Build errors on 2.7 and >=3.8 (officially only supports 3.6 and 3.7).
|
FONTCONFIG_FILE = makeFontsConf {
|
||||||
disabled = !(isPy3k && (pythonOlder "3.8"));
|
fontDirectories = [ freefont_ttf ];
|
||||||
|
};
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytest
|
||||||
|
];
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.6" || pythonAtLeast "3.8";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Parametric scripting language for creating and traversing CAD models";
|
description = "Parametric scripting language for creating and traversing CAD models";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user