diff options
| author | Benjamin Hipple <bhipple@protonmail.com> | 2020-05-22 10:34:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-22 10:34:58 -0400 |
| commit | 531eab10a89ae299735490626e206a68552a2b08 (patch) | |
| tree | 7dfe17b68975aadb0f69cbc3025f77f128147ba2 | |
| parent | 0ddf012e303045f535af1a953411626c4908abb6 (diff) | |
| parent | a2ba99b22fe225b4da7600b77ebae8b7dc2271e1 (diff) | |
| download | nixlib-531eab10a89ae299735490626e206a68552a2b08.tar nixlib-531eab10a89ae299735490626e206a68552a2b08.tar.gz nixlib-531eab10a89ae299735490626e206a68552a2b08.tar.bz2 nixlib-531eab10a89ae299735490626e206a68552a2b08.tar.lz nixlib-531eab10a89ae299735490626e206a68552a2b08.tar.xz nixlib-531eab10a89ae299735490626e206a68552a2b08.tar.zst nixlib-531eab10a89ae299735490626e206a68552a2b08.zip | |
Merge pull request #88572 from marcus7070/marcus7070/cq-bump
python3Packages.cadquery: 2.0RC0 -> 2.0
| -rw-r--r-- | pkgs/applications/graphics/cq-editor/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/cadquery/default.nix | 33 |
2 files changed, 24 insertions, 13 deletions
diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index a6b35b1d8ea6..a6cfd256ac58 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -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; [ diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix index 6f3632f743be..886224d16918 100644 --- a/pkgs/development/python-modules/cadquery/default.nix +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -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"; |