{cura,curaengine}: 4.10.0 -> 4.12.1,
{libnest2d,libarcus,libsavitar,pynest2d,uranium}: 4.10.0 -> 4.12.0
This commit is contained in:
parent
7488432e57
commit
9812836f38
|
@ -3,13 +3,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "cura";
|
pname = "cura";
|
||||||
version = "4.10.0";
|
version = "4.12.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Ultimaker";
|
owner = "Ultimaker";
|
||||||
repo = "Cura";
|
repo = "Cura";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0v65xg31rw4kc7f98k8zz0kmhrp9m55k8ahblha9r1vr4krcf30z";
|
sha256 = "sha256-QvX9o1nrYmY6zzPcxl+xD6JTMdphzT/is1SMYrISu4o=";
|
||||||
};
|
};
|
||||||
|
|
||||||
materials = fetchFromGitHub {
|
materials = fetchFromGitHub {
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "curaengine";
|
pname = "curaengine";
|
||||||
version = "4.10.0";
|
version = "4.12.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Ultimaker";
|
owner = "Ultimaker";
|
||||||
repo = "CuraEngine";
|
repo = "CuraEngine";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-t5i6s0KKcaoMqzDxZ6JL1NyKP33uxWdmyziK3xh8q88=";
|
sha256 = "sha256-+sjysxOaNLq6p3yCoB1qKosBO5Cg2/1o7xmUtZ15wkE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }:
|
{ lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "2020-10-09-unstable";
|
version = "4.12.0";
|
||||||
pname = "libnest2d";
|
pname = "libnest2d";
|
||||||
|
|
||||||
# This revision is waiting to be merged upstream
|
# This revision is waiting to be merged upstream
|
||||||
|
|
|
@ -4,14 +4,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "libarcus";
|
pname = "libarcus";
|
||||||
version = "4.10.0";
|
version = "4.12.0";
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Ultimaker";
|
owner = "Ultimaker";
|
||||||
repo = "libArcus";
|
repo = "libArcus";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1ahka8s8fjwymyr7pca7i7h51ikfr35zy4nkzfcjn946x7p0dprf";
|
sha256 = "sha256-X33ptwYj9YkVWqUDPP+Ic+hoIb+rwsLdQXvHLA9z+3w=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -2,14 +2,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "libsavitar";
|
pname = "libsavitar";
|
||||||
version = "4.10.0";
|
version = "4.12.0";
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Ultimaker";
|
owner = "Ultimaker";
|
||||||
repo = "libSavitar";
|
repo = "libSavitar";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1zyzsrdm5aazv12h7ga35amfryrbxdsmx3abvh27hixyh9f92fdp";
|
sha256 = "sha256-MAA1WtGED6lvU6N4BE6wwY1aYaFrCq/gkmQFz3VWqNA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
, libnest2d, sip_4, clipper }:
|
, libnest2d, sip_4, clipper }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "4.10.0";
|
version = "4.12.0";
|
||||||
pname = "pynest2d";
|
pname = "pynest2d";
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ buildPythonPackage rec {
|
||||||
owner = "Ultimaker";
|
owner = "Ultimaker";
|
||||||
repo = "pynest2d";
|
repo = "pynest2d";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "03aj0whxj9rs9nz3idld7w4vpmnr6vr40vpwmzcf5w2pi2n4z4lk";
|
sha256 = "sha256-QQdTDhO4i9NVhegGTmdEQSNv3gooaZzTX/Rv86h3GEo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ libnest2d sip_4 clipper ];
|
propagatedBuildInputs = [ libnest2d sip_4 clipper ];
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
, pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }:
|
, pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "4.10.0";
|
version = "4.12.0";
|
||||||
pname = "uranium";
|
pname = "uranium";
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ buildPythonPackage rec {
|
||||||
owner = "Ultimaker";
|
owner = "Ultimaker";
|
||||||
repo = "Uranium";
|
repo = "Uranium";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0bxbkqc4ajs52vmalmhvvqvl1aw2ss6yf7nclwx8nc2g5vchd4ng";
|
sha256 = "sha256-SE9xqrloPXIRTJiiqUdRKFmb4c0OjmJK5CMn6VXMFmk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
disabled = pythonOlder "3.5.0";
|
disabled = pythonOlder "3.5.0";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user