From 9812836f38e06b445e542f89fa4eba6fa96910b2 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 13 Dec 2021 15:40:41 +0100 Subject: [PATCH 1/2] {cura,curaengine}: 4.10.0 -> 4.12.1, {libnest2d,libarcus,libsavitar,pynest2d,uranium}: 4.10.0 -> 4.12.0 --- pkgs/applications/misc/cura/default.nix | 4 ++-- pkgs/applications/misc/curaengine/default.nix | 4 ++-- pkgs/development/libraries/libnest2d/default.nix | 2 +- pkgs/development/python-modules/libarcus/default.nix | 4 ++-- pkgs/development/python-modules/libsavitar/default.nix | 4 ++-- pkgs/development/python-modules/pynest2d/default.nix | 4 ++-- pkgs/development/python-modules/uranium/default.nix | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 32b9085b3de2..521da8e2f8e9 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "cura"; - version = "4.10.0"; + version = "4.12.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "0v65xg31rw4kc7f98k8zz0kmhrp9m55k8ahblha9r1vr4krcf30z"; + sha256 = "sha256-QvX9o1nrYmY6zzPcxl+xD6JTMdphzT/is1SMYrISu4o="; }; materials = fetchFromGitHub { diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index d0dfde5b3820..c6af30b78552 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.10.0"; + version = "4.12.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "sha256-t5i6s0KKcaoMqzDxZ6JL1NyKP33uxWdmyziK3xh8q88="; + sha256 = "sha256-+sjysxOaNLq6p3yCoB1qKosBO5Cg2/1o7xmUtZ15wkE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libnest2d/default.nix b/pkgs/development/libraries/libnest2d/default.nix index 1e666758f816..4117b38e1d9b 100644 --- a/pkgs/development/libraries/libnest2d/default.nix +++ b/pkgs/development/libraries/libnest2d/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }: stdenv.mkDerivation rec { - version = "2020-10-09-unstable"; + version = "4.12.0"; pname = "libnest2d"; # This revision is waiting to be merged upstream diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 4002f527a451..494e786e9784 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.10.0"; + version = "4.12.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "1ahka8s8fjwymyr7pca7i7h51ikfr35zy4nkzfcjn946x7p0dprf"; + sha256 = "sha256-X33ptwYj9YkVWqUDPP+Ic+hoIb+rwsLdQXvHLA9z+3w="; }; patches = [ diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index e82400b565fd..588ebfcd1e95 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.10.0"; + version = "4.12.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "1zyzsrdm5aazv12h7ga35amfryrbxdsmx3abvh27hixyh9f92fdp"; + sha256 = "sha256-MAA1WtGED6lvU6N4BE6wwY1aYaFrCq/gkmQFz3VWqNA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix index 1f338806a18f..9be7072a89fb 100644 --- a/pkgs/development/python-modules/pynest2d/default.nix +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -2,7 +2,7 @@ , libnest2d, sip_4, clipper }: buildPythonPackage rec { - version = "4.10.0"; + version = "4.12.0"; pname = "pynest2d"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "pynest2d"; rev = version; - sha256 = "03aj0whxj9rs9nz3idld7w4vpmnr6vr40vpwmzcf5w2pi2n4z4lk"; + sha256 = "sha256-QQdTDhO4i9NVhegGTmdEQSNv3gooaZzTX/Rv86h3GEo="; }; propagatedBuildInputs = [ libnest2d sip_4 clipper ]; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index a8ce6713f2c0..58b96b5cd7a4 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.10.0"; + version = "4.12.0"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "0bxbkqc4ajs52vmalmhvvqvl1aw2ss6yf7nclwx8nc2g5vchd4ng"; + sha256 = "sha256-SE9xqrloPXIRTJiiqUdRKFmb4c0OjmJK5CMn6VXMFmk="; }; disabled = pythonOlder "3.5.0"; From 66e037cf8ed399bc51e60e5381b1ef218c8859d0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 13 Dec 2021 15:41:17 +0100 Subject: [PATCH 2/2] cura_stable: fix build by using correct version number --- pkgs/applications/misc/cura/stable.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix index 5383cbe9a23a..a2ec91193ea4 100644 --- a/pkgs/applications/misc/cura/stable.nix +++ b/pkgs/applications/misc/cura/stable.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }: -let - py = python27Packages; - version = "15.04"; -in +{ lib, stdenv, python27Packages, curaengine, makeDesktopItem, fetchFromGitHub }: + stdenv.mkDerivation rec { pname = "cura"; - inherit version; + version = "15.06.03"; - src = fetchurl { - url = "https://github.com/daid/Cura/archive/${version}.tar.gz"; - sha256 = "0xbjvzhp8wzq9lnpmcg1fjf7j5h39bj5463sd5c8jzdjl96izizl"; + src = fetchFromGitHub { + owner = "daid"; + repo = "Cura"; + rev = version; + sha256 = "sha256-o1cAi4Wi19WOijlRB9iYwNEpSNnmywUj5Bth8rRhqFA="; }; desktopItem = makeDesktopItem { @@ -22,13 +21,13 @@ stdenv.mkDerivation rec { categories = "GNOME;GTK;Utility;"; }; - python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ]; + python_deps = with python27Packages; [ pyopengl pyserial numpy wxPython30 power setuptools ]; pythonPath = python_deps; propagatedBuildInputs = python_deps; - buildInputs = [ curaengine py.wrapPython ]; + buildInputs = [ curaengine python27Packages.wrapPython ]; configurePhase = ""; buildPhase = "";