aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorGabriel Ebner <gebner@gebner.org>2020-12-06 15:01:04 +0100
committerGitHub <noreply@github.com>2020-12-06 15:01:04 +0100
commita6dabb2a868c70a7628052d0bd60f9419633ee06 (patch)
treeb3cd38b095a09cb4d51127b9aaf68bb94addf4bd /pkgs/development/python-modules
parentb07dcf9715664ff0f2caf8f6da4ab46d54518546 (diff)
parentb9e970027f9292773c69d1498b32ccc591f30900 (diff)
Merge pull request #103941 from poita66/cura_4.8.0
cura: 4.7.1 -> 4.8.0
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r--pkgs/development/python-modules/libarcus/default.nix4
-rw-r--r--pkgs/development/python-modules/libsavitar/default.nix4
-rw-r--r--pkgs/development/python-modules/pynest2d/default.nix31
3 files changed, 35 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index 5b68695f832e..e69e51ccf555 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "libarcus";
- version = "4.7.1";
+ version = "4.8.0";
format = "other";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "libArcus";
rev = version;
- sha256 = "0wmrcvw7k34ib93shhmjzh6kpndgqr37kyr377sril5clmac0z1f";
+ sha256 = "1dvz1rkvm4309yzvj7vy49v1vskr5yfq4nzqdiydp1jb7zpvhqqm";
};
disabled = pythonOlder "3.4.0";
diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix
index 27144ccf1ad3..9b6aa7bc3a8d 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.7.1";
+ version = "4.8.0";
format = "other";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "libSavitar";
rev = version;
- sha256 = "0mzr3ynfap51bcn6kshyi2h6iny2gpavn6g3b1xcsgzzlxqgfixf";
+ sha256 = "1mxkvnhn8k1a86jlnjnlpf0b8dvrcg3n7pslf60s13cgb7w3sfzh";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix
new file mode 100644
index 000000000000..3a7c6b43392b
--- /dev/null
+++ b/pkgs/development/python-modules/pynest2d/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, python3, cmake
+, pythonOlder, libnest2d, sip, clipper }:
+
+buildPythonPackage rec {
+ version = "4.8.0";
+ pname = "pynest2d";
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "Ultimaker";
+ repo = "pynest2d";
+ rev = version;
+ sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp";
+ };
+
+ propagatedBuildInputs = [ libnest2d sip clipper ];
+ nativeBuildInputs = [ cmake ];
+
+ CLIPPER_PATH = "${clipper.out}";
+
+ postPatch = ''
+ sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python3.sitePackages}#' cmake/SIPMacros.cmake
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Python bindings for libnest2d";
+ homepage = "https://github.com/Ultimaker/pynest2d";
+ license = licenses.lgpl3;
+ platforms = platforms.linux;
+ };
+}