mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
Merge pull request #97285 from gebner/cura471
This commit is contained in:
commit
37379c0215
@ -2,20 +2,20 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "cura";
|
||||
version = "4.6.1";
|
||||
version = "4.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "Cura";
|
||||
rev = version;
|
||||
sha256 = "0h1r9caa579d3gfpcmch54rdbkg5df64ds2v84iqsbxwjp0rmn4n";
|
||||
sha256 = "19an168iad3cb5w8i71c0wbr79qnz5qnpxqx1j6dgh64qz6ffn2r";
|
||||
};
|
||||
|
||||
materials = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "fdm_materials";
|
||||
rev = version;
|
||||
sha256 = "1k5c3qmixhpz3z2yi0fysxcyyf1yhcwmdlrcypkw827lhsialqp4";
|
||||
sha256 = "1w6i0dlff8b30q987x3y0zv8847fc8ppfcr9vi982msmv284c89z";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ];
|
||||
|
@ -6,13 +6,13 @@ let
|
||||
|
||||
octoprint = stdenv.mkDerivation rec {
|
||||
pname = "Cura-OctoPrintPlugin";
|
||||
version = "3.5.12";
|
||||
version = "3.5.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fieldOfView";
|
||||
repo = pname;
|
||||
rev = "ad522c0b7ead5fbe28da686a3cc75e351274c2bc";
|
||||
sha256 = "0ln11ng32bh0smfsk54mv2j3sadh0gwf031nmm95zrvbj9cr6yc0";
|
||||
rev = "8affa8aa9796cb37129d3b7222fff03f86c936cd";
|
||||
sha256 = "0l4qfcashkdmpdm8nm3klz6hmi1f0bmbpb9b1yn4mvg0fam6c5xi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "curaengine";
|
||||
version = "4.6.1";
|
||||
version = "4.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "CuraEngine";
|
||||
rev = version;
|
||||
sha256 = "1fr151hmdg2lhk9pbpan1hb1pafj784nijr4pz646ljmjh12vfk2";
|
||||
sha256 = "177fk6j4gn3ssi8j1qxj8p4486f7jkz328vc75agxnh7vhd4mwsm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -3,14 +3,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libarcus";
|
||||
version = "4.6.1";
|
||||
version = "4.7.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "libArcus";
|
||||
rev = version;
|
||||
sha256 = "1sfy8skvgw6hiihs9jmfn7a13yappqwffir98pahyg7cim7p55kr";
|
||||
sha256 = "0wmrcvw7k34ib93shhmjzh6kpndgqr37kyr377sril5clmac0z1f";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.4.0";
|
||||
|
@ -2,14 +2,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libsavitar";
|
||||
version = "4.6.1";
|
||||
version = "4.7.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "libSavitar";
|
||||
rev = version;
|
||||
sha256 = "0nk8zl5b0b36wrrkj271ck4phzxsigkjsazndscjslc9nkldmnpq";
|
||||
sha256 = "0mzr3ynfap51bcn6kshyi2h6iny2gpavn6g3b1xcsgzzlxqgfixf";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -2,7 +2,7 @@
|
||||
, pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.6.1";
|
||||
version = "4.7.1";
|
||||
pname = "uranium";
|
||||
format = "other";
|
||||
|
||||
@ -10,7 +10,7 @@ buildPythonPackage rec {
|
||||
owner = "Ultimaker";
|
||||
repo = "Uranium";
|
||||
rev = version;
|
||||
sha256 = "07pksjbgxs1ks2i6pgxkwfg9c56pcql7f9p89dnwaf2rcn7yhx6r";
|
||||
sha256 = "1h5d3scy3cnbyhh0pbavflpqklhn2lbp7hl193rc5gx8yzr3mqbh";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.5.0";
|
||||
|
Loading…
Reference in New Issue
Block a user