public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/cq-editor/default.nix
View File

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

19
pkgs/development/python-modules/cadquery/default.nix
View File

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