Merge pull request #43541 from jfrankenau/update-cura

cura: 3.3.1 -> 3.4.1

pkgs/applications/misc/cura/default.nix

@@ -2,20 +2,20 @@
 
 mkDerivation rec {
   name = "cura-${version}";
-  version = "3.3.1";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "Cura";
     rev = version;
-    sha256 = "0a2xxiw1h5cq4nd4pdkq757hap85p2i29msxs57kbfdd78izrjlx";
+    sha256 = "03s9nf1aybbnbf1rzqja41m9g6991bbvrcly1lcrfqksianfn06w";
   };
 
   materials = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "fdm_materials";
-    rev = "3.3.0";
+    rev = "3.4.1";
-    sha256 = "0vf7s4m14aqhdg4m2yjj87kjxi2gpa46mgx86p0a91jwvkxa8a1q";
+    sha256 = "1pw30clxqd7qgnidsyx6grizvlgfn8rhj6rd5ppkvv3rdjh0gj28";
   };
 
   buildInputs = [ qtbase qtquickcontrols2 ];

pkgs/applications/misc/curaengine/default.nix

@@ -1,18 +1,18 @@
-{ stdenv, fetchFromGitHub, cmake, libarcus }:
+{ stdenv, fetchFromGitHub, cmake, libarcus, stb }:
 
 stdenv.mkDerivation rec {
   name = "curaengine-${version}";
-  version = "3.3.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "CuraEngine";
     rev = version;
-    sha256 = "1dj80lk58qb54apdv7n9cmcck4smb00lidgqld21xnndnnqqb4lw";
+    sha256 = "083jmhzmb60rmqw0fhbnlxyblzkmpn3k6zc75xq90x5g3h60wib4";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ libarcus ];
+  buildInputs = [ libarcus stb ];
 
   cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ];
 

pkgs/development/libraries/stb/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "stb-${version}";
+  version = "20180211";
+
+  src = fetchFromGitHub {
+    owner = "nothings";
+    repo = "stb";
+    rev = "e6afb9cbae4064da8c3e69af3ff5c4629579c1d2";
+    sha256 = "079nsn9bnb8c0vfq26g5l53q6gzx19a5x9q2nb55mpcljxsgxnmf";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/include/stb
+    cp *.h $out/include/stb/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Single-file public domain libraries for C/C++";
+    homepage = https://github.com/nothings/stb;
+    license = licenses.publicDomain;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jfrankenau ];
+  };
+}

pkgs/development/python-modules/libarcus/default.nix

@@ -3,7 +3,8 @@
 
 buildPythonPackage rec {
   pname = "libarcus";
-  version = "3.3.0";
+  version = "3.4.1";
+  format = "other";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";

pkgs/development/python-modules/uranium/default.nix

@@ -2,7 +2,7 @@
 , pyqt5, numpy, scipy, libarcus, doxygen, gettext, pythonOlder }:
 
 buildPythonPackage rec {
-  version = "3.3.0";
+  version = "3.4.1";
   pname = "uranium";
   format = "other";
 
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "Ultimaker";
     repo = "Uranium";
     rev = version;
-    sha256 = "1rg0l2blndnbdfcgkjc2r29cnjdm009rz8lnc225ilh9d7w1srbb";
+    sha256 = "1r6d65c9xfkn608k6wv3dprpks5h8g2v9mi4a67ifpzyw4y3f0rk";
   };
 
   disabled = pythonOlder "3.5.0";

pkgs/top-level/all-packages.nix

@@ -11882,6 +11882,8 @@ with pkgs;
     libpcap = if stdenv.isLinux then libpcap else null;
   };
 
+  stb = callPackage ../development/libraries/stb { };
+
   stxxl = callPackage ../development/libraries/stxxl { parallel = true; };
 
   sqlite = lowPrio (callPackage ../development/libraries/sqlite { });