Merge pull request #88572 from marcus7070/marcus7070/cq-bump

python3Packages.cadquery: 2.0RC0 -> 2.0
This commit is contained in:
Benjamin Hipple 2020-05-22 10:34:58 -04:00 committed by GitHub
commit 531eab10a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 13 deletions

View File

@ -6,13 +6,13 @@
mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "cq-editor";
version = "0.1RC1";
version = "0.1RC2";
src = fetchFromGitHub {
owner = "CadQuery";
repo = "CQ-editor";
rev = version;
sha256 = "0iwcpnj15s64k16948sakvkn1lb4mqwrhmbxk3r03bczs0z33zax";
sha256 = "0zima4pmn34s8b2axxwy6qd1f1r5ki34byq4x3rrd7n3g0hagxz5";
};
propagatedBuildInputs = with python3Packages; [

View File

@ -2,6 +2,7 @@
, buildPythonPackage
, isPy3k
, pythonOlder
, pythonAtLeast
, fetchFromGitHub
, pyparsing
, opencascade
@ -16,9 +17,12 @@
, libGLU
, libX11
, six
, pytest
, makeFontsConf
, freefont_ttf
}:
let
let
pythonocc-core-cadquery = stdenv.mkDerivation {
pname = "pythonocc-core-cadquery";
version = "0.18.2";
@ -31,7 +35,7 @@ let
sha256 = "07zmiiw74dyj4v0ar5vqkvk30wzcpjjzbi04nsdk5mnlzslmyi6c";
};
nativeBuildInputs = [
nativeBuildInputs = [
cmake
swig
ninja
@ -63,27 +67,34 @@ let
in
buildPythonPackage rec {
pname = "cadquery";
version = "2.0RC0";
version = "2.0";
src = fetchFromGitHub {
owner = "CadQuery";
repo = pname;
rev = version;
sha256 = "1xgd00rih0gjcnlrf9s6r5a7ypjkzgf2xij2b6436i76h89wmir3";
sha256 = "1n63b6cjjrdwdfmwq0zx1xabjnhndk9mgfkm4w7z9ardcfpvg84l";
};
buildInputs = [
opencascade
];
propagatedBuildInputs = [
pyparsing
pythonocc-core-cadquery
];
# Build errors on 2.7 and >=3.8 (officially only supports 3.6 and 3.7).
disabled = !(isPy3k && (pythonOlder "3.8"));
FONTCONFIG_FILE = makeFontsConf {
fontDirectories = [ freefont_ttf ];
};
checkInputs = [
pytest
];
disabled = pythonOlder "3.6" || pythonAtLeast "3.8";
meta = with lib; {
description = "Parametric scripting language for creating and traversing CAD models";
homepage = "https://github.com/CadQuery/cadquery";