Merge master into staging-next

2021-05-22 12:27:09 +00:00
parent cc35c7fc85 ae5268b96e
commit 563389a7fd
22 changed files with 550 additions and 26 deletions
@@ -23,6 +23,7 @@
 , opencascade-occt
 , pivy
 , pkg-config
+, ply
 , pycollada
 , pyside2
 , pyside2-tools
@@ -80,6 +81,7 @@ mkDerivation rec {
    ode
    opencascade-occt
    pivy
+    ply # for openSCAD file support
    pycollada
    pyside2
    pyside2-tools