movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge pull request #190138 from newAM/prusa-slicer-2.5.0

Browse source
This commit is contained in:
Sandro 2022-09-10 21:47:04 +02:00 • committed by GitHub
commit accf3b38d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/misc/prusa-slicer/default.nix
View file

@ -22,6 +22,7 @@
, libpng , libpng
, mpfr , mpfr
, nlopt , nlopt
, opencascade-occt
, openvdb , openvdb
, pcre , pcre
, qhull , qhull
@ -48,7 +49,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "prusa-slicer"; pname = "prusa-slicer";
version = "2.4.2"; version = "2.5.0";
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
@ -74,6 +75,7 @@ stdenv.mkDerivation rec {
libpng libpng
mpfr mpfr
nlopt nlopt
opencascade-occt
openvdb openvdb
pcre pcre
systemd systemd
@ -133,7 +135,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "prusa3d"; owner = "prusa3d";
repo = "PrusaSlicer"; repo = "PrusaSlicer";
sha256 = "17p56f0zmiryy8k4da02in1l6yxniz286gf9yz8s1gaz5ksqj4af"; sha256 = "sha256-wLe+5TFdkgQ1mlGYgp8HBzugeONSne17dsBbwblILJ4=";
rev = "version_${version}"; rev = "version_${version}";
}; };

4
pkgs/development/libraries/opencascade-occt/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "opencascade-occt"; pname = "opencascade-occt";
version = "7.5.1"; version = "7.6.2";
commit = "V${builtins.replaceStrings ["."] ["_"] version}"; commit = "V${builtins.replaceStrings ["."] ["_"] version}";
src = fetchurl { src = fetchurl {
name = "occt-${commit}.tar.gz"; name = "occt-${commit}.tar.gz";
url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; 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 ]; nativeBuildInputs = [ cmake ninja ];

8
pkgs/development/python-modules/pythonocc-core/default.nix
View file

@ -12,18 +12,18 @@
, opencascade-occt , opencascade-occt
, rapidjson , rapidjson
, smesh , smesh
, swig , swig4
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pythonocc-core"; pname = "pythonocc-core";
version = "7.5.1"; version = "7.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tpaviot"; owner = "tpaviot";
repo = "pythonocc-core"; repo = "pythonocc-core";
rev = version; rev = version;
sha256 = "1md6x60pnfq0qv4lsnmjv6i96mzdrcpxcgpb316i7wmv9b5ci01s"; sha256 = "sha256-45pqPQ07KYlpFwJSAYVHbzuqDQTbAvPpxReal52DCzU=";
}; };
postPatch = '' postPatch = ''
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
--replace "/usr/X11R6/lib/libGLU.dylib" "${libGLU}/lib/libGLU.dylib" --replace "/usr/X11R6/lib/libGLU.dylib" "${libGLU}/lib/libGLU.dylib"
''; '';
nativeBuildInputs = [ cmake swig ]; nativeBuildInputs = [ cmake swig4 ];
buildInputs = [ buildInputs = [
python opencascade-occt smesh python opencascade-occt smesh
freetype libGL libGLU libX11 libXext libXmu libXi freetype libGL libGLU libX11 libXext libXmu libXi