From dba1d9d41f0013ab2e006930119ec35b3826fb9b Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 4 Nov 2025 12:54:59 -0300 Subject: [PATCH 1/5] libnest2d: fix build with cmake4 --- pkgs/by-name/li/libnest2d/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/libnest2d/package.nix b/pkgs/by-name/li/libnest2d/package.nix index 88906caac71e..cd583bdc7d2c 100644 --- a/pkgs/by-name/li/libnest2d/package.nix +++ b/pkgs/by-name/li/libnest2d/package.nix @@ -25,6 +25,9 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace {,examples/}CMakeLists.txt \ --replace "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)" + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" + ''; propagatedBuildInputs = [ From 3c6f8e70701a2305cdc95170cd4590c4616bb634 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 4 Nov 2025 15:11:03 -0300 Subject: [PATCH 2/5] python3Packages.pynest2d: fix build --- pkgs/development/python-modules/pynest2d/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix index 87cbebb03d7f..5fb72a4cbdb0 100644 --- a/pkgs/development/python-modules/pynest2d/default.nix +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -7,6 +7,7 @@ libnest2d, sip4, clipper, + distutils, }: buildPythonPackage rec { @@ -25,8 +26,14 @@ buildPythonPackage rec { libnest2d sip4 clipper + distutils ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + sip4 + ]; + + strictDeps = true; CLIPPER_PATH = "${clipper.out}"; From 357258645704c51753cb48312c8f5fb7bbfd6667 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 4 Nov 2025 17:45:50 -0300 Subject: [PATCH 3/5] python3Packages.libarcus: fix build --- .../python-modules/libarcus/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index b408fdbb5f48..6188f2c5aaa7 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -7,6 +7,7 @@ cmake, sip4, protobuf, + distutils, }: buildPythonPackage rec { @@ -30,16 +31,25 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ sip4 ]; - nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ + sip4 + distutils + ]; + + nativeBuildInputs = [ + cmake + sip4 + ]; + buildInputs = [ protobuf ]; + strictDeps = true; + postPatch = '' sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake ''; meta = with lib; { - broken = true; description = "Communication library between internal components for Ultimaker software"; homepage = "https://github.com/Ultimaker/libArcus"; license = licenses.lgpl3Plus; From db1c70ed2a789a3e9a4f7eb8db5d6dff29c5c8b0 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 4 Nov 2025 18:25:04 -0300 Subject: [PATCH 4/5] python3Packages.libsavitar: fix build --- .../python-modules/libsavitar/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index a2522c5dc816..2ffd0075f501 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, cmake, sip4, + distutils, }: buildPythonPackage rec { @@ -22,11 +23,22 @@ buildPythonPackage rec { postPatch = '' sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake + + substituteInPlace pugixml/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + sip4 + ]; - propagatedBuildInputs = [ sip4 ]; + propagatedBuildInputs = [ + sip4 + distutils + ]; + + strictDeps = true; disabled = pythonOlder "3.4.0"; From 1218c9ca216af0ded0feb0c8caa127c64132ab77 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 9 Nov 2025 05:39:59 -0300 Subject: [PATCH 5/5] libsavitar: modernize --- .../python-modules/libsavitar/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 2ffd0075f501..7ccfe8052faf 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -40,15 +40,11 @@ buildPythonPackage rec { strictDeps = true; - disabled = pythonOlder "3.4.0"; - - meta = with lib; { + meta = { description = "C++ implementation of 3mf loading with SIP python bindings"; homepage = "https://github.com/Ultimaker/libSavitar"; - license = licenses.lgpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ - orivej - ]; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ orivej ]; }; }