From patchwork Fri May 23 02:00:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nomike X-Patchwork-Id: 42869 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 63EFA27BC49; Fri, 23 May 2025 03:02:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F008727BC4A for ; Fri, 23 May 2025 03:02:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uIHjZ-0000on-4H; Thu, 22 May 2025 22:02:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uIHjX-0000ob-0s for guix-patches@gnu.org; Thu, 22 May 2025 22:02:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uIHjW-0007bb-M7 for guix-patches@gnu.org; Thu, 22 May 2025 22:02:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=PqmptMgX7/rOsDJfgSZJmwGsT24/WYrHori5fSAwuNg=; b=biTPHSZ7LhPgTuGRRB3ST+rrp2QP0/PG7BT3bHEHMqMhoNWw5A8AhdcPXiiqO2nOxno7VK1SdWExMdZH8qd9f6AGSFh1YI0q+IPOePiZVuEYhlWPMxfNl2fWYzneR0pSOknNqjmI9s2vRkZb93bdkm5XckLHcxFyNw1xh5Ofpzl9aG120E84dY4OdOEMNMR0A4oVWhMt0FDIw/UM6sB65INNH9n3m3nd8K3CsrNr84r0qbVYBkn2LkscGkMFCWHU2nq504yRwRfFFgSBd1leg1iUAhqYIE7VQBLJydtnVOOLYJH8OgDtaJDNtWP/nBcTdJFVK5BLFTRGU59ukwUxTg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uIHjW-0006TA-9z for guix-patches@gnu.org; Thu, 22 May 2025 22:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78555] [PATCH] gnu: Add pythonscad Resent-From: nomike Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 May 2025 02:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78555 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78555@debbugs.gnu.org Cc: nomike X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174796567724662 (code B ref -1); Fri, 23 May 2025 02:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 May 2025 02:01:17 +0000 Received: from localhost ([127.0.0.1]:41674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uIHin-0006Pi-3X for submit@debbugs.gnu.org; Thu, 22 May 2025 22:01:17 -0400 Received: from lists.gnu.org ([2001:470:142::17]:51028) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uIHii-0006PE-Ct for submit@debbugs.gnu.org; Thu, 22 May 2025 22:01:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uIHic-0000hY-Bz for guix-patches@gnu.org; Thu, 22 May 2025 22:01:06 -0400 Received: from siberian.tulip.relay.mailchannels.net ([23.83.218.246]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uIHiX-0007Wt-Ri for guix-patches@gnu.org; Thu, 22 May 2025 22:01:05 -0400 X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 01E3881C52; Fri, 23 May 2025 02:00:58 +0000 (UTC) Received: from pdx1-sub0-mail-a211.dreamhost.com (trex-green-6.trex.outbound.svc.cluster.local [100.117.152.135]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 5614B817DC; Fri, 23 May 2025 02:00:57 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1747965657; a=rsa-sha256; cv=none; b=LAZ2qYdn36dOn1zEiSANuLNJ+/VUGuZ2pYg4qjooUZ/uhE6f6vBl9/sm9M+yq98xolbC8l zQgo5Ih+rh7/VTPyBXtkGdKeYJlUp9U/sol/fA1hFVgyuehL7nj53e5anLH6raO1DjMFvd JsqY+9CLm1vmv87htLMX6jUsuJYZOfqKa5koKBtuOiXloM+Mzx207jQm3K2jOLK8la1tSz /vsPXvzABhA5b2/bfCaFLPIekXBmYkukzOH/RD0hTDrHeQyRWdYoD04DRDSIIAX+Pe2C+p lhuF1HfEsvjp9pgEGiPFxwXSsW298oJsxLqCuwRW3vfBjoH3xcJZjF5JLzP+lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1747965657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=PqmptMgX7/rOsDJfgSZJmwGsT24/WYrHori5fSAwuNg=; b=hF4EuH3Bls8t06GPWBP8M0gLTRZxihDYPruCJ9J/HzSCpJmqrbEiE0H/i5DxcccnqiaK0K wNwvnIOYXvhEkg5QYjab8G3dK1AboBaX2zq6Whra8qzhoSAxAgJ9+wlYr4UEBgisKqlAYY DxM+1mIgowMyI1Mv4eBr5BD5xUmaLoAYZts9EHwDRPy6MZuGyR3h1ndT5Kx/hFwZaeLhVn do3llNh7g79MqckShMJfioS2Sw1oaVqf6eFKu58SNIDiaW/crUUKKJSjzWSf15PVCu4uD6 4nzAvmLL+Conq7urYitULd3MEXvJAQkC3lzMdqrMlq6c/LV8YjmTkrKFyq54mQ== ARC-Authentication-Results: i=1; rspamd-5b49d78d5-6c98k; auth=pass smtp.auth=dreamhost smtp.mailfrom=nomike@nomike.com X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|nomike@nomike.com X-MailChannels-Auth-Id: dreamhost X-Towering-Unite: 34aaa1507377fc4e_1747965657819_645249402 X-MC-Loop-Signature: 1747965657818:69336939 X-MC-Ingress-Time: 1747965657818 Received: from pdx1-sub0-mail-a211.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.117.152.135 (trex/7.0.3); Fri, 23 May 2025 02:00:57 +0000 Received: from localhost (84-112-221-106.cable.dynamic.surfer.at [84.112.221.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nomike@nomike.com) by pdx1-sub0-mail-a211.dreamhost.com (Postfix) with ESMTPSA id 4b3T08520cz3k; Thu, 22 May 2025 19:00:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1747965657; bh=PqmptMgX7/rOsDJfgSZJmwGsT24/WYrHori5fSAwuNg=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=pLAPW78hEn1343jX1rUDo4YpndcKmEImcnz8BPJ2zIG1jEFcOJObvrlReS7cY/OQs 0OlUXLYa2o8zYHyD9cD8l7sq/1RdXfTZdQ5dCTVUAk1fo4QjjfQ9zxX0D2o9lYI/l7 2hZ2cix5EdimXU9zURQSJEsb4CuYYnbnuBhCCcHMJWrKRv5chh978RIKTMDLb6zfPJ 1wfpR26HKtaTxrHpsYYToZZlJlXA3fT15wX61MfCwjCq90WMWBsGbbgTQn4gH54u3M 8oqf/OYQecOALL5VabQwkJhMzvOYWdtvO2jJbL1o7zDtF/cMy27IcQnxxDwPiJeOT0 paJfKHpCVDp6g== From: nomike Date: Fri, 23 May 2025 04:00:40 +0200 Message-ID: <20250523020040.1756306-1-nomike@nomike.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=23.83.218.246; envelope-from=nomike@nomike.com; helo=siberian.tulip.relay.mailchannels.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/engineering.scm (pythonscad): New variable Change-Id: I66737d0eaaa7546dcd407d7371166c9b5d5d9b31 --- gnu/packages/engineering.scm | 77 +++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 8b1332e186..c81f4d5dbe 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3315,6 +3315,79 @@ (define-public openscad (home-page "https://openscad.org/") (license license:gpl2+)))) +(define-public pythonscad + (let ((commit "b856456fcf26e089a616e5a9b5d685b8a8f2e2c1") + (version "2025.05.21") + (revision "0")) + (package + (inherit openscad) + (name "pythonscad") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pythonscad/pythonscad") + (commit commit) + (recursive? #t))) + (sha256 + (base32 "0bjpvj94m3kplpnmnlai7mjx45d5acnqw943w3p1mprg8wrp3ap6")) + (file-name (git-file-name name version)))) + (arguments + (list + #:configure-flags + #~(list "-DCMAKE_BUILD_TYPE=Release" + "-DUSE_BUILTIN_OPENCSG=ON" + "-DMANIFOLD_PYBIND=OFF" + "-DMANIFOLD_TEST=OFF" + "-DENABLE_TESTS=OFF" + "-DEXPERIMENTAL=ON" + "-DSNAPSHOT=ON" + "-DENABLE_PYTHON=ON" + (string-append "-DPYTHON_VERSION=" + (string-join (reverse (list-tail (reverse (string-split #$ + (package-version + (this-package-input + "python")) + #\.)) + 1)) ".")) + "-DUSE_BUILTIN_CLIPPER2=OFF" + (string-append "-DOPENSCAD_VERSION=" + #$version) + (string-append "-DOPENSCAD_COMMIT=" + #$commit) + "-DENABLE_EGL=ON" + "-DENABLE_GLX=ON") + #:phases + #~(modify-phases %standard-phases + (delete 'check) + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + ;; + (substitute* "cmake/Modules/FindLib3MF.cmake" + (("PC_LIB3MF_INCLUDE_DIRS") + "PC_LIB3MF_INCLUDEDIR")) + (substitute* "CMakeLists.txt" + ;; + (("target_link_libraries\\(OpenSCAD PRIVATE OpenGL::EGL\\)") + " find_package(ECM REQUIRED NO_MODULE) + list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + find_package(EGL REQUIRED) + target_link_libraries(OpenSCAD PRIVATE EGL::EGL)") + ;; + (("find_package\\(Nettle 3.4\\)") + "find_package(Nettle 3.4 REQUIRED)") + ;; Use the system sanitizers-cmake module. + (("\\$\\{CMAKE_SOURCE_DIR\\}/submodules/sanitizers-cmake/cmake") + (string-append (assoc-ref inputs "sanitizers-cmake") + "/share/sanitizers-cmake/cmake")))))))) + (inputs (modify-inputs (package-inputs openscad) + (append libjpeg-turbo curl python nettle))) + (home-page "https://openscad.org/") + (description + "A fork of @code{OpenSCAD} that lets you use Python as its native language.")))) + + (define-public emacs-scad-mode (package (name "emacs-scad-mode") @@ -3349,8 +3422,8 @@ (define-public emacs-scad-mode @item Org Babel support (@code{scad} source blocks) @end itemize") - (home-page "https://openscad.org/") - (license license:gpl3+))) + (home-page "https://openscad.org/") + (license license:gpl3+))) (define-public emacs-scad-dbus (package