From patchwork Mon Mar 31 06:18:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41065 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 5F8F127BBEA; Mon, 31 Mar 2025 07:21:51 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 C7F1527BBE2 for ; Mon, 31 Mar 2025 07:21:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tz8WP-00056A-Ce; Mon, 31 Mar 2025 02:21:21 -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 1tz8WM-00054b-HL for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:18 -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 1tz8WM-0008Bw-79 for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:18 -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:References:In-Reply-To:Date:From:To:Subject; bh=/DHlVBfuzCIBLro6QcI9AwMBd2O4NPclZ1yP480mgdU=; b=mYUPiQ5XMeMKOEZ9JXtBP13X770XIni5rzxB4q6QPztaVvz7avsO7scf1JcCWl4+yHsCn3PuybPfd4SCu/LPBMhbUj1qbIpHCZr1Pbsux+6PEkE0zH6Ziw+8R0VTJMw2rYqns6E5xJFUdTK7aEWHbYZXyanNS2wOAU4T1mc+8bq4yiKveh+NcGNPdcAX93kCk8o5ukPRbczQhdeQshoZMXatwoCU5Oor4bGgsb/1Fx19fSW8IE9oDDql4SSK5/GSIUQQZVSigs/vybNtq/wnqudnaZi+rYTdysnxQgyZkJZ8ZmPdqE5qWUpjTNguqSlzk+iNEbQqjoWWpvzSvgO8Aw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tz8WM-0007Pm-2c for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77400] [PATCH 25/26] gnu: openmolar: Fix build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Mar 2025 06:21:18 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77400 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77400@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 77400-submit@debbugs.gnu.org id=B77400.174340204628141 (code B ref 77400); Mon, 31 Mar 2025 06:21:18 +0000 Received: (at 77400) by debbugs.gnu.org; 31 Mar 2025 06:20:46 +0000 Received: from localhost ([127.0.0.1]:39302 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tz8Vp-0007Jh-O2 for submit@debbugs.gnu.org; Mon, 31 Mar 2025 02:20:46 -0400 Received: from 3.mo562.mail-out.ovh.net ([46.105.33.63]:44539) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tz8Uc-00071A-EZ for 77400@debbugs.gnu.org; Mon, 31 Mar 2025 02:19:32 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZR1Dx3c4Wz1WxK; Mon, 31 Mar 2025 06:19:29 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77400@debbugs.gnu.org>; Mon, 31 Mar 2025 06:19:29 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.140.31]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZR1Dx2r1nzy94; Mon, 31 Mar 2025 06:19:29 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.1]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id EC3BC3A3E8D; Mon, 31 Mar 2025 06:19:28 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-108S002ae9b3577-6a0d-4db8-9e72-8d51260dad5c, 87830A87949A0BA70EB5F3889DD10BC79FDA47E2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Mon, 31 Mar 2025 08:18:53 +0200 Message-ID: <20250331061901.22670-25-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250331061901.22670-1-ngraves@ngraves.fr> References: <20250331061901.22670-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 3742772769425122018 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeeludekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepfeeuvdeiveegleeitdfhkedtteejkedvgfdvudehgeegkeduiedttdfhjeehuedunecuffhomhgrihhnpehgnhhurdhorhhgpdhophgvnhhmohhlrghrrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeegtddtseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=/DHlVBfuzCIBLro6QcI9AwMBd2O4NPclZ1yP480mgdU=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1743401969; v=1; b=kuH3r1ZtWORmAGRcEyqGkjVw4oQMjCKgvyOzeHVLbDoMemCCHrq/2dRBhfAM1QMjIKCAAXN4 F+MHOtgfDwjagdlqow+5lxU4+cbbzyN7za7JsR2Wr12hspdbmvyQosbZ1KEAzVP3netF+Snri29 nIIb23PT2AHP1MDhNF1cBfD672/KopNEk3gTDbtvpIdDYXYk5pgNZlbDYi1VEAyKMyCWCWF63CD Zp3DSD7LihuDy9ZV9OxXlLsG2J/x0qx0kF5nmwUiJVq+NOdiWEo/5smlU31tU1ivHSzXJEoFq8P +baeF+Ty9YHHkHlEkjuWM6c5NUolv7VhIR6Yprl60Z+Pg== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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/medical.scm (openmolar): Fix build. [build-system]: Switch to pyproject-build-system. [arguments]{use-setuptools?}: Drop it. {phases}: Add phase 'set-acceptable-version. [native-inputs]: Add python-setuptools, python-wheel. --- gnu/packages/medical.scm | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/gnu/packages/medical.scm b/gnu/packages/medical.scm index c755508db9..25e769c576 100644 --- a/gnu/packages/medical.scm +++ b/gnu/packages/medical.scm @@ -19,6 +19,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages medical) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (guix download) @@ -29,6 +30,7 @@ (define-module (gnu packages medical) #:use-module (gnu packages databases) #:use-module (gnu packages kde-frameworks) ; kirigami #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -93,18 +95,26 @@ (define-public openmolar-1 ".tar.gz")) (sha256 (base32 "09vrfqn511vswnj2q9m7srlwdgz066qvqpmja6sg1yl1ibh3cbpr")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:use-setuptools? #f - #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-/usr - (lambda* (#:key outputs #:allow-other-keys) - (substitute* '("setup.py" - "src/openmolar/settings/localsettings.py") - (("/usr") - (assoc-ref outputs "out"))) #t))))) - (inputs (list python-pyqtwebengine python-pyqt+qscintilla - python-mysqlclient qscintilla)) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-/usr + (lambda* (#:key outputs #:allow-other-keys) + (substitute* '("setup.py" + "src/openmolar/settings/localsettings.py") + (("/usr") #$output)))) + (add-after 'unpack 'set-acceptable-version + (lambda _ + (substitute* "src/openmolar/settings/version.py" + ((#$version) "1.1.6"))))))) + (native-inputs + (list python-setuptools python-wheel)) + (inputs (list python-pyqtwebengine + python-pyqt+qscintilla + python-mysqlclient + qscintilla)) (propagated-inputs (list qtwebengine-5)) (home-page "https://openmolar.com/om1") (synopsis "Dental practice management software")