Build123d

expressions/OCP/default.nix

@@ -22,8 +22,7 @@
 let
   # We need to use an unmodified version number for the dist-utils version so
   # that the version check in cadquery works
-  # remember to change version number in dump_symbols.py as well
-  base-version = "7.6.3";
+  base-version = "7.7.0";
   version = "v${base-version}-git-${src.shortRev}";
 
   vtk_main_version = lib.versions.majorMinor vtk_9.version;

expressions/OCP/dump_symbols.py

@@ -5,7 +5,7 @@
 prefix = sys.argv[1]
 
 prefix_linux = Path(prefix).expand()
-libs = prefix_linux.glob('**/libTK*.so.7.6.3')
+libs = prefix_linux.glob('**/libTK*.so.*')
 
 exported_symbols = []
 

expressions/build123d.nix

@@ -0,0 +1,11 @@
+{ buildPythonPackage, src, ocp, ocp-stubs, setuptools, typing-extensions, svgpathtools, numpy, anytree, ezdxf }:
+
+buildPythonPackage rec {
+  pname = "build123d";
+  version = if (builtins.hasAttr "rev" src) then src.shortRev else "local-dev";
+  format = "pyproject";
+  inherit src;
+
+  patches = [ ./no-git-dep.diff ];
+  propagatedBuildInputs = [ ocp ocp-stubs setuptools typing-extensions svgpathtools numpy anytree ezdxf ];
+}

expressions/no-git-dep.diff

@@ -0,0 +1,19 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 737f549..4aa8d8f 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -36,10 +36,10 @@ classifiers = [
+ ]
+
+ dependencies = [
+-    "cadquery-ocp ~= 7.7.0a0",
+-    "OCP-stubs @ git+https://github.com/CadQuery/[email protected]",
+-    "typing_extensions >= 4.4.0, <5",
+-    "numpy >= 1.24.1, <2",
++    "ocp ~= 7.7.0a0",
++    "OCP-stubs",
++    "typing_extensions >= 4.3.0, <5",
++    "numpy >= 1.23.3, <2",
+     "svgpathtools >= 1.5.1, <2",
+     "anytree >= 2.8.0, <3",
+     "ezdxf >= 1.0.0, < 2"

expressions/opencascade-occt/default.nix

@@ -18,7 +18,7 @@
   , freetype
   , freeimage
   , fontconfig
-  , tbb
+  , tbb_2021_8
   , rapidjson
   , glew
 }:
@@ -27,13 +27,13 @@ let
 in
   stdenv.mkDerivation rec {
   pname = "opencascade-occt";
-  version = "7.6.3";
+  version = "7.7.0";
   commit = "V${builtins.replaceStrings ["."] ["_"] version}";
 
   src = fetchurl {
     name = "occt-${commit}.tar.gz";
     url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz";
-    sha256 = "sha256-ZXkz6MLUMTRb+uyJNEmbzuOOR6JPqvSAJl9A6F2ExJw=";
+    hash = "sha256-aEWhf+X0CzaFpXG+l+VpZgXeI8x6vxD4pkTSFjcRxv8=";
   };
 
   nativeBuildInputs = [ cmake ninja ];
@@ -50,7 +50,7 @@ in
     freetype
     freeimage
     fontconfig
-    tbb
+    tbb_2021_8
     rapidjson
     glew
   ] ++ vtk_9.buildInputs;

expressions/py-overrides.nix

@@ -11,6 +11,7 @@
   , nlopt_nonpython
   , casadi_nonpython
   , pybind11-stubgen-src
+  , build123d-src
 }: self: super: rec {
   clang = self.callPackage ./clang.nix {
     src = llvm-src;
@@ -133,4 +134,18 @@
       sha256 = "611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7";
     };
   });
+
+  svgpathtools = super.buildPythonPackage rec {
+    pname = "svgpathtools";
+    version = "1.6.0";
+    src = super.python.pkgs.fetchPypi {
+      inherit pname version;
+      hash = "sha256-wLk07tKayusJmIr7TRXFmENmhHI24huAwHnY7bWsDE4=";
+    };
+    propagatedBuildInputs = with super.python.pkgs; [ numpy scipy svgwrite ];
+  };
+
+  build123d = self.callPackage ./build123d.nix {
+    src = build123d-src;
+  };
 }

flake.nix

@@ -13,11 +13,11 @@
       flake = false;
     };
     ocp-src = {
-      url = "github:cadquery/ocp";
+      url = "github:cadquery/ocp/7.7.0.0";
       flake = false;
     };
     ocp-stubs-src = {
-      url = "github:cadquery/ocp-stubs";
+      url = "github:cadquery/ocp-stubs/7.7.0";
       flake = false;
     };
     pywrap-src = {
@@ -32,6 +32,10 @@
       url = "github:CadQuery/pybind11-stubgen";
       flake = false;
     };
+    build123d-src = {
+      url = "github:gumyr/build123d";
+      flake = false;
+    };
   };
 
   outputs = { self, nixpkgs, flake-utils, ... } @ inputs:
@@ -51,7 +55,7 @@
             stdenv = pkgs.stdenv; # not currently used, can probably be removed unless I have to control GCC version again in the future
           };
           # I'm quite worried about how I handle this VTK. Python -> VTK (for Python bindings) -> OCCT -> Python(OCP)
-          new_vtk_9 = pkgs.libsForQt5.callPackage ./expressions/VTK { enablePython = true; pythonInterpreter = python; };
+          new_vtk_9 = pkgs.libsForQt5.callPackage ./expressions/VTK { enablePython = true; pythonInterpreter = python; ffmpeg = pkgs.ffmpeg_4; };
           opencascade-occt = pkgs.callPackage ./expressions/opencascade-occt {
             inherit (gccSet) stdenv;
             vtk_9 = new_vtk_9;
@@ -70,7 +74,7 @@
           };
           py-overrides = import expressions/py-overrides.nix {
             inherit gccSet;
-            inherit (inputs) llvm-src pywrap-src ocp-src ocp-stubs-src cadquery-src pybind11-stubgen-src;
+            inherit (inputs) llvm-src pywrap-src ocp-src ocp-stubs-src cadquery-src pybind11-stubgen-src build123d-src;
             inherit (pkgs) fetchFromGitHub;
             vtk_9_nonpython = new_vtk_9;
             occt = opencascade-occt;
@@ -121,6 +125,7 @@
             #   ++ [ pytest ]
             #   ++ cadquery.nativeBuildInputs
             # ));
+            build123d = python.withPackages ( ps: with ps; [ build123d ]);
             inherit python opencascade-occt;
           };