diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 936efd60e95b..286abfb3fdb1 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -22,6 +22,7 @@ , libpng , mpfr , nlopt +, opencascade-occt , openvdb , pcre , qhull @@ -48,7 +49,7 @@ let in stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.4.2"; + version = "2.5.0"; nativeBuildInputs = [ cmake @@ -74,6 +75,7 @@ stdenv.mkDerivation rec { libpng mpfr nlopt + opencascade-occt openvdb pcre systemd @@ -133,7 +135,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "17p56f0zmiryy8k4da02in1l6yxniz286gf9yz8s1gaz5ksqj4af"; + sha256 = "sha256-wLe+5TFdkgQ1mlGYgp8HBzugeONSne17dsBbwblILJ4="; rev = "version_${version}"; }; diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix index f2a9833d77d0..2a8d49d9d134 100644 --- a/pkgs/development/libraries/opencascade-occt/default.nix +++ b/pkgs/development/libraries/opencascade-occt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "opencascade-occt"; - version = "7.5.1"; + version = "7.6.2"; 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-1whKU+7AMVYabfs15x8MabohKonn5oM54ZEtxF93wAo="; + sha256 = "sha256-n3KFrN/mN1SVXfuhEUAQ1fJzrCvhiclxfEIouyj9Z18="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 8a9433ec898f..1bef56a01a40 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -12,18 +12,18 @@ , opencascade-occt , rapidjson , smesh -, swig +, swig4 }: stdenv.mkDerivation rec { pname = "pythonocc-core"; - version = "7.5.1"; + version = "7.6.2"; src = fetchFromGitHub { owner = "tpaviot"; repo = "pythonocc-core"; rev = version; - sha256 = "1md6x60pnfq0qv4lsnmjv6i96mzdrcpxcgpb316i7wmv9b5ci01s"; + sha256 = "sha256-45pqPQ07KYlpFwJSAYVHbzuqDQTbAvPpxReal52DCzU="; }; postPatch = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { --replace "/usr/X11R6/lib/libGLU.dylib" "${libGLU}/lib/libGLU.dylib" ''; - nativeBuildInputs = [ cmake swig ]; + nativeBuildInputs = [ cmake swig4 ]; buildInputs = [ python opencascade-occt smesh freetype libGL libGLU libX11 libXext libXmu libXi