From patchwork Fri Oct 13 15:47:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 54803 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 7C0CC27BBE9; Fri, 13 Oct 2023 16:48:52 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 A228427BBE2 for ; Fri, 13 Oct 2023 16:48:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrKP5-0008FE-7C; Fri, 13 Oct 2023 11:48:43 -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 1qrKP1-0008C1-RK for guix-patches@gnu.org; Fri, 13 Oct 2023 11:48:39 -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 1qrKP1-0005rh-Gr for guix-patches@gnu.org; Fri, 13 Oct 2023 11:48:39 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qrKPO-0007NB-Bj; Fri, 13 Oct 2023 11:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH 1/7] gnu: mutter: Remove dependency on (guix build syscalls). Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Fri, 13 Oct 2023 15:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66525 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66525@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 66525-submit@debbugs.gnu.org id=B66525.169721212128133 (code B ref 66525); Fri, 13 Oct 2023 15:49:02 +0000 Received: (at 66525) by debbugs.gnu.org; 13 Oct 2023 15:48:41 +0000 Received: from localhost ([127.0.0.1]:47155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKP2-0007Jd-G2 for submit@debbugs.gnu.org; Fri, 13 Oct 2023 11:48:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKP0-0007Ib-Ae for 66525@debbugs.gnu.org; Fri, 13 Oct 2023 11:48:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrKOX-0005nK-Su; Fri, 13 Oct 2023 11:48:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=kWliIqwEcaTuqk9SeEFDrxUlDinnvOiXObyYT7N204E=; b=oRpmWFySGG1agWBynXw9 Y6eqqlB9l0WiXbQLBnRSDZGtij1dqE4nK1R/l4Jy34p96Gh1f3jhhFxzeUM2dcxCisAAFl49rHJHQ ULrmqXe6J+W8+Q7lQ5N6DVucGf3RkKToVFAeFuNEOMaRbpKkgg46vtOU3DeXhG1ExySMNRCFaBgn2 n06plQSOhOUYOklTNH6QYYgZQ5ca7IzIHV0HGa3dUFyF2Jkn7gzMyMwNwj6b6nkjo+DxAFP1D4/3q phz4T/CfhJ3wCRH7ku5yiad9bOU4HKhTiZlzfeNcfTZT4RZavWdBeKhFMTutDuNKgJZRJtQPB0sDB 2P3YtotIjpH0Bg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 13 Oct 2023 17:47:44 +0200 Message-ID: <51c7e4c608c40f38c83a4ac9db88e8e1c2985ac1.1697211312.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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/gnome.scm (mutter)[arguments]: Remove #:imported-modules. Remove (guix build syscalls) from #:modules. Rewrite ‘check’ phase to reap processes from the build process. [native-inputs]: Remove TINI. --- gnu/packages/gnome.scm | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 908b5782b5..a4993b7aa9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7831,10 +7831,7 @@ (define-public mutter (build-system meson-build-system) (arguments (list - #:imported-modules `(,@%meson-build-system-modules - (guix build syscalls)) #:modules '((guix build meson-build-system) - (guix build syscalls) (guix build utils) (ice-9 match)) #:glib-or-gtk? #t @@ -7928,22 +7925,23 @@ (define-public mutter "1")) (match (primitive-fork) (0 ;child process - (set-child-subreaper!) ;; Use tini so that signals are properly handled and ;; doubly-forked processes get reaped; otherwise, ;; python-dbusmock would waste time polling for the dbus ;; processes it spawns to be reaped, in vain. - (apply execlp "tini" "--" - "dbus-run-session" "--" + (apply execlp "dbus-run-session" "dbus-run-session" "xvfb-run" "-a" "-s" (getenv "XVFB_SERVER_ARGS") "meson" "test" "-t" "0" "--print-errorlogs" test-options)) - (pid - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (error "`meson test' exited with status" - status)))))))))))) + (dbus-pid + (let loop () + (match (waitpid WAIT_ANY) + ((pid . status) + (if (= pid dbus-pid) + (unless (zero? status) + (error "`meson test' exited with status" + status)) + (loop))))))))))))) (native-inputs (list desktop-file-utils ;for update-desktop-database `(,glib "bin") ;for glib-compile-schemas, etc. @@ -7964,8 +7962,7 @@ (define-public mutter pipewire python python-dbus - python-dbusmock - tini)) ;acting as init (zombie reaper) + python-dbusmock)) (propagated-inputs (list gsettings-desktop-schemas-next ;required by libmutter.pc gtk+ ;required by libmutter.pc From patchwork Fri Oct 13 15:47:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 54804 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 96AB827BBE9; Fri, 13 Oct 2023 16:49:13 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 1EA1D27BBE2 for ; Fri, 13 Oct 2023 16:49:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrKPG-0008Ko-I5; Fri, 13 Oct 2023 11:48:55 -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 1qrKP8-0008Ht-Cq for guix-patches@gnu.org; Fri, 13 Oct 2023 11:48:47 -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 1qrKP7-0005s5-Nc; Fri, 13 Oct 2023 11:48:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qrKPO-0007NM-PH; Fri, 13 Oct 2023 11:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH 2/7] gnu: python-ipykernel: Remove dependency on (guix build syscalls). Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 13 Oct 2023 15:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66525 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66525@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart Received: via spool by 66525-submit@debbugs.gnu.org id=B66525.169721212228150 (code B ref 66525); Fri, 13 Oct 2023 15:49:02 +0000 Received: (at 66525) by debbugs.gnu.org; 13 Oct 2023 15:48:42 +0000 Received: from localhost ([127.0.0.1]:47159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKP2-0007Jh-Vf for submit@debbugs.gnu.org; Fri, 13 Oct 2023 11:48:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKP0-0007Ig-QN for 66525@debbugs.gnu.org; Fri, 13 Oct 2023 11:48:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrKOY-0005nS-EU; Fri, 13 Oct 2023 11:48:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=ngS+oa3bTImNt05VTlnNkjitGb/CtP2T7yvy34AVFGM=; b=D9liX+xJJpBk5nunfBtQ W/HxIsVpgb7jexprKdfe8ZveSuiDmthn2bUk3JyaAfq+ltmYb6d/SIqLsQO9IXSGtLyr47OgqZxEv G3S35GeuoYSX7eQWgbjt+AFzmRNiKhM64q4CIbVJFxFs16F9792yGi5mIx/X/6CgjH7Bfg9V2A/h+ cXqwtOZ3D1GB04jExp/632VOurUadrJ4wH/OVeoESfprVq2XWz1YTZKeBHvCMellcGlEDW+MuKH0+ LO+YPsBwgZfSNu9oXkrtdJCWVCzpHXd/VlN8fRPnMDSKMPZInNFE/MNsW+a6DSUPzClJM8Zrx4fzG TaSuLa0fVrHA3Q==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 13 Oct 2023 17:47:45 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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/python-xyz.scm (python-ipykernel)[arguments]: Remove #:imported-modules. Remove (guix build syscalls) from #:modules. Rewrite ‘check’ phase to reap child processes from the build process. [native-inputs]: Remove TINI. --- gnu/packages/python-xyz.scm | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a45ff44be1..07984adb8e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10644,10 +10644,7 @@ (define-public python-ipykernel (build-system pyproject-build-system) (arguments (list - #:imported-modules `(,@%pyproject-build-system-modules - (guix build syscalls)) #:modules '((guix build pyproject-build-system) - (guix build syscalls) (guix build utils) (ice-9 match)) #:phases @@ -10666,20 +10663,19 @@ (define-public python-ipykernel (when tests? (match (primitive-fork) (0 ;child process - (set-child-subreaper!) - ;; XXX: Tini provides proper PID1-like signal handling that - ;; reaps zombie processes, necessary for the - ;; 'test_shutdown_subprocesses' test to pass. - - ;; TODO: Complete https://issues.guix.gnu.org/30948. (setenv "HOME" "/tmp") - (execlp "tini" "--" "pytest" "-vv")) - (pid - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (error "`pytest' exited with status" - status))))))))) + (execlp "pytest" "pytest" "-vv")) + (pytest-pid + ;; Reap zombie processes, necessary for the + ;; 'test_shutdown_subprocesses' test to pass. + (let loop () + (match (waitpid WAIT_ANY) + ((pid . status) + (if (= pid pytest-pid) + (unless (zero? status) + (error "`pytest' exited with status" + status)) + (loop)))))))))) (add-after 'install 'set-python-file-name (lambda* (#:key inputs #:allow-other-keys) ;; Record the absolute file name of the 'python' executable in @@ -10708,8 +10704,7 @@ (define-public python-ipykernel ;; and causes deprecation warnings. Using the bootstrap variant ;; avoids that. python-pytest-bootstrap - python-pytest-timeout - tini)) + python-pytest-timeout)) (home-page "https://ipython.org") (synopsis "IPython Kernel for Jupyter") (description "This package provides the IPython kernel for Jupyter.") From patchwork Fri Oct 13 15:47:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 54808 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 6123E27BBE9; Fri, 13 Oct 2023 16:49:26 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 94FF927BBE2 for ; Fri, 13 Oct 2023 16:49:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrKPd-0000Ag-RD; Fri, 13 Oct 2023 11:49:17 -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 1qrKP8-0008Hz-NE for guix-patches@gnu.org; Fri, 13 Oct 2023 11:48:47 -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 1qrKP8-0005sD-83; Fri, 13 Oct 2023 11:48:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qrKPP-0007NU-5y; Fri, 13 Oct 2023 11:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH 3/7] gnu: python-dbusmock: Remove dependency on (guix build syscalls). Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 13 Oct 2023 15:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66525 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66525@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart Received: via spool by 66525-submit@debbugs.gnu.org id=B66525.169721212628201 (code B ref 66525); Fri, 13 Oct 2023 15:49:03 +0000 Received: (at 66525) by debbugs.gnu.org; 13 Oct 2023 15:48:46 +0000 Received: from localhost ([127.0.0.1]:47169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKP8-0007Kj-0z for submit@debbugs.gnu.org; Fri, 13 Oct 2023 11:48:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKP2-0007Ix-TR for 66525@debbugs.gnu.org; Fri, 13 Oct 2023 11:48:41 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrKOa-0005na-Hq; Fri, 13 Oct 2023 11:48:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=t1RT1DZq0hG7cWg6Bw2AiHlmJCh5PHtIVFoUjgwN43U=; b=AlU1EY5xSpwFfCvcYRFI +lwMvUvbp3VpQ5jw0muMoWyk8dpiuuN5jiCly1Lp04Wpo4jC9wKmBPwAL2SWYZcv1zYAizYlPn8Ho YMfMGEDWkKGf13TFwPLPuoyZyTZ45Ys9F7xsi387cAw7/i0kfMdlLL9T89SeFstU/Ipw1OHWk8Y8i jkc8KO3/ZEd22Pq4bKapsNhQm51ZS/qJ3+10KYD+9f9MyaxDB5fRhG0XQ16Do0uzvJ//dB/uFdZN+ 63HepcdEkMTD5lyc5os39c25Rqu09FNb6NwrEAXYaQiMkjyLLYVpf5S03cRhlO4cTK/4VMcW+hpPa uFAbMCKzf1goxQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 13 Oct 2023 17:47:46 +0200 Message-ID: <14bf42fc8911d464d5a9f7cadc11ba05b4f54b07.1697211312.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 Having a dependency on (guix build syscalls) this deep in the stack would make it much harder to change syscalls.scm. * gnu/packages/python-xyz.scm (python-dbusmock)[native-inputs]: Remove TINY. [arguments]: Remove #:imported-modules, and remove (guix build syscalls) from #:modules. Rewrite ‘check’ phase to reap processes from the build process itself. --- gnu/packages/python-xyz.scm | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 07984adb8e..e871951def 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27156,12 +27156,10 @@ (define-public python-dbusmock "1nwl0gzzds2g1w1gfxfzlgrkb5hr1rrdyn619ml25c6b1rjyfk3g")))) (build-system python-build-system) (arguments - `(#:imported-modules (,@%python-build-system-modules - (guix build syscalls)) - #:modules ((guix build python-build-system) - (guix build syscalls) + `(#:modules ((guix build python-build-system) (guix build utils) (ice-9 match)) + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths @@ -27177,20 +27175,20 @@ (define-public python-dbusmock (when tests? (match (primitive-fork) (0 ;child process - (set-child-subreaper!) - ;; Use tini so that signals are properly handled and - ;; doubly-forked processes get reaped; otherwise, - ;; python-dbusmock would waste time polling for the dbus - ;; processes it spawns to be reaped, in vain. - (execlp "tini" "--" "pytest" "-vv")) - (pid - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (error "`pytest' exited with status" - status)))))))))))) + (execlp "pytest" "pytest" "-vv")) + (pytest-pid + (let loop () + ;; Reap child processes; otherwise, python-dbusmock would + ;; waste time polling for the dbus processes it spawns to + ;; be reaped, in vain. + (match (waitpid WAIT_ANY) + ((pid . status) + (if (= pid pytest-pid) + (unless (zero? status) + (error "`pytest' exited with status" status)) + (loop))))))))))))) (native-inputs - (list dbus python-pytest tini which)) + (list dbus python-pytest which)) (inputs (list dbus)) (propagated-inputs From patchwork Fri Oct 13 15:47:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 54809 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 6405E27BBE9; Fri, 13 Oct 2023 16:49:30 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 C9E9427BBE2 for ; Fri, 13 Oct 2023 16:49:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrKPg-0000Dp-3L; Fri, 13 Oct 2023 11:49:20 -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 1qrKP8-0008Hw-Dk for guix-patches@gnu.org; Fri, 13 Oct 2023 11:48:47 -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 1qrKP6-0005ry-6e; Fri, 13 Oct 2023 11:48:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qrKPP-0007Nf-K8; Fri, 13 Oct 2023 11:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH 4/7] gnu: python-dbusmock: Rewrite phases as a gexp. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 13 Oct 2023 15:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66525 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66525@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart Received: via spool by 66525-submit@debbugs.gnu.org id=B66525.169721212728211 (code B ref 66525); Fri, 13 Oct 2023 15:49:03 +0000 Received: (at 66525) by debbugs.gnu.org; 13 Oct 2023 15:48:47 +0000 Received: from localhost ([127.0.0.1]:47171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKP8-0007Kt-Rv for submit@debbugs.gnu.org; Fri, 13 Oct 2023 11:48:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKP3-0007Iz-07 for 66525@debbugs.gnu.org; Fri, 13 Oct 2023 11:48:42 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrKOa-0005ng-LF; Fri, 13 Oct 2023 11:48:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=KJih++ayGGNr+emLLHKUp9WJfIYdN3xbhqvmH8z8KyM=; b=FkJEa1dTuyntlzBAuRJd wk1PQrT1g1jweq5/ZpcPNjnX/2H+qAUDBm/K0nkC8sweUL4F9LI0rIxrnUKtIoD3OTklYPermI5fb UmivJvbGQRBUpFHz6voGi0y9XGdLd8ogfW6LEiRhC64uPrHC2nzltYUnd2UqoLR0xtg2vJWtjsBNE /j49HvY2YUJLyCypGj68bt+33WV7KPdYpCL8ROogtSel/vln0/xDQJMGlfrIx/fn+yoQVKObItx8r d/RkhlW1CSDOcCqgaPNBnFWcX6FagR1EGvqbP3lgdu9qL51iVcwWB+jw0NY16vzdI40qcFka9tJIz r4H2PL1aXVZAGg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 13 Oct 2023 17:47:47 +0200 Message-ID: <0ee0f58bdbe25eeed5bcf4ce52c56e6d6b180bb9.1697211312.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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/python-xyz.scm (python-dbusmock)[arguments]: Use gexps. --- gnu/packages/python-xyz.scm | 62 +++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e871951def..d6747a55c0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27156,37 +27156,39 @@ (define-public python-dbusmock "1nwl0gzzds2g1w1gfxfzlgrkb5hr1rrdyn619ml25c6b1rjyfk3g")))) (build-system python-build-system) (arguments - `(#:modules ((guix build python-build-system) - (guix build utils) - (ice-9 match)) + (list #:modules `((guix build python-build-system) + (guix build utils) + (ice-9 match)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "tests/test_code.py" - (("/bin/bash") (which "bash"))) - (substitute* "dbusmock/testcase.py" - (("'dbus-daemon'") - (string-append "'" (assoc-ref inputs "dbus") - "/bin/dbus-daemon'"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (match (primitive-fork) - (0 ;child process - (execlp "pytest" "pytest" "-vv")) - (pytest-pid - (let loop () - ;; Reap child processes; otherwise, python-dbusmock would - ;; waste time polling for the dbus processes it spawns to - ;; be reaped, in vain. - (match (waitpid WAIT_ANY) - ((pid . status) - (if (= pid pytest-pid) - (unless (zero? status) - (error "`pytest' exited with status" status)) - (loop))))))))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/test_code.py" + (("/bin/bash") + (which "bash"))) + (substitute* "dbusmock/testcase.py" + (("'dbus-daemon'") + (string-append "'" (assoc-ref inputs "dbus") + "/bin/dbus-daemon'"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (match (primitive-fork) + (0 ;child process + (execlp "pytest" "pytest" "-vv")) + (pytest-pid + (let loop () + ;; Reap child processes; otherwise, python-dbusmock + ;; would waste time polling for the dbus processes + ;; it spawns to be reaped, in vain. + (match (waitpid WAIT_ANY) + ((pid . status) + (if (= pid pytest-pid) + (unless (zero? status) + (error "`pytest' exited with status" + status)) + (loop))))))))))))) (native-inputs (list dbus python-pytest which)) (inputs From patchwork Fri Oct 13 15:47:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 54807 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 5032B27BBEA; Fri, 13 Oct 2023 16:49:22 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 4D79B27BBE2 for ; Fri, 13 Oct 2023 16:49:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrKPF-0008KI-Lv; Fri, 13 Oct 2023 11:48:53 -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 1qrKP8-0008Hs-Bx for guix-patches@gnu.org; Fri, 13 Oct 2023 11:48:46 -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 1qrKP3-0005rr-Cv; Fri, 13 Oct 2023 11:48:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qrKPQ-0007Nv-Cu; Fri, 13 Oct 2023 11:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH 5/7] gnu: python-dbusmock: Use =?utf-8?b?4oCY?= =?utf-8?b?c2VhcmNoLWlucHV0LWZpbGXigJku?= Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 13 Oct 2023 15:49:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66525 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66525@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart Received: via spool by 66525-submit@debbugs.gnu.org id=B66525.169721212828221 (code B ref 66525); Fri, 13 Oct 2023 15:49:04 +0000 Received: (at 66525) by debbugs.gnu.org; 13 Oct 2023 15:48:48 +0000 Received: from localhost ([127.0.0.1]:47173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKP9-0007Ky-ED for submit@debbugs.gnu.org; Fri, 13 Oct 2023 11:48:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKP3-0007J7-TG for 66525@debbugs.gnu.org; Fri, 13 Oct 2023 11:48:42 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrKOb-0005nw-Gc; Fri, 13 Oct 2023 11:48:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=Sg/xItFJMaHz7+VLXvVlQXTXWeEg1X37znM49q/z9iM=; b=SSk28R0SYRT7U4AnQuI8 AKjTJXGV0kZqhF53DwxzpkYTf/5C/dW3/h69pR92EElk/R0c49gfaphfG1XJ21jhTSp7hZCKpReLh SZ95q3+qbYsFsitg4pZcTs0kxnRVoc7fX8D0cqqo/T9PmSUOBoIg8AYs+KNpXPB1tsY0sgIy2uAYY 5iwE3yY6XfrvlO9++32Gj0Zyc3xBpHtVK6XjFr9G1ERONLuxWXzYeeC3tFHqWh316yKhuh0X/qjZe blLitg04skLb3yB/4gcD9pxRpY50vYDP+xabupl7rIDZt9iAMcRA0I2KAozkQGNiX+f50iHFG9MLA KP0rTfJX50FKSw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 13 Oct 2023 17:47:48 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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/python-xyz.scm (python-dbusmock)[arguments]: In ‘patch-paths’ phase, use ‘search-input-file’ instead of ‘assoc-ref’. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d6747a55c0..c70ea6eea5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27169,8 +27169,8 @@ (define-public python-dbusmock (which "bash"))) (substitute* "dbusmock/testcase.py" (("'dbus-daemon'") - (string-append "'" (assoc-ref inputs "dbus") - "/bin/dbus-daemon'"))))) + (object->string + (search-input-file inputs "/bin/dbus-daemon")))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? From patchwork Fri Oct 13 15:47:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 54805 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 7BEF927BBED; Fri, 13 Oct 2023 16:49:19 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 A23C327BBEA for ; Fri, 13 Oct 2023 16:49:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrKPb-0008Pa-3M; Fri, 13 Oct 2023 11:49:15 -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 1qrKP8-0008Hv-Dv for guix-patches@gnu.org; Fri, 13 Oct 2023 11:48:47 -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 1qrKP3-0005rs-R5 for guix-patches@gnu.org; Fri, 13 Oct 2023 11:48:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qrKPQ-0007O6-SG for guix-patches@gnu.org; Fri, 13 Oct 2023 11:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH 6/7] gnu: polkit: Remove dependency on (guix build syscalls). Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Oct 2023 15:49:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66525 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66525@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 66525-submit@debbugs.gnu.org id=B66525.169721212828232 (code B ref 66525); Fri, 13 Oct 2023 15:49:04 +0000 Received: (at 66525) by debbugs.gnu.org; 13 Oct 2023 15:48:48 +0000 Received: from localhost ([127.0.0.1]:47175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKP9-0007L7-S2 for submit@debbugs.gnu.org; Fri, 13 Oct 2023 11:48:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKP4-0007JD-ON for 66525@debbugs.gnu.org; Fri, 13 Oct 2023 11:48:43 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrKOc-0005o9-DC; Fri, 13 Oct 2023 11:48:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=lph36ZU9akmssS2zxAhK6eE2vHn3QeT2zjJ1zbSDW6s=; b=IoJDNcVwUhw/CS8fhSZO ePmtG38DpYNeWTOXCOb4tJ/WCXtBLkmgvwG6yWzglHPlwg3M2kHJ3JYtZij1MHPP3vFUgxRN9j07x sDLAcr8ORL7bQ2bNfM2xp/uzNWqOguOpPGtLR5PZzk7oZPGmx2TR9R4f/g/Bu5k7xOyRNE8Ltd+zB Vsl01Dq66MWjbF5Wkt5xNabP8tKQxTFlE9zQ29CHYKq/loy0Si4flgzgK6bVup2VhNFxDd+QeuEB+ m7n6TMtTq0H60NZ/QalII6ClBlu/RKpLFrVED7eGHogQ4zFqSlgqHyKIsH/bCssoumvKsQyGo2Al5 H0NyqP64bLmkaA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 13 Oct 2023 17:47:49 +0200 Message-ID: <6fc608f82eed9b32bfdbb9c39ce5b186f7acf2f5.1697211312.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 Having a dependency on (guix build syscalls) this deep in the stack would make it much harder to change syscalls.scm. * gnu/packages/polkit.scm (polkit)[arguments]: Remove #:imported-modules. Remove (guix build syscalls) from #:modules. Rewrite ‘check’ phase to reap processes from the build process. [native-inputs]: Remove TINI. --- gnu/packages/polkit.scm | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 6fe7824a57..2f733dd703 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -95,10 +95,7 @@ (define-public polkit (build-system meson-build-system) (arguments (list - #:imported-modules `(,@%meson-build-system-modules - (guix build syscalls)) #:modules '((guix build meson-build-system) - (guix build syscalls) (guix build utils) (ice-9 match)) #:configure-flags @@ -130,24 +127,23 @@ (define-public polkit (replace 'check (lambda* (#:key tests? test-options #:allow-other-keys) (when tests? - ;; Run the test suite through tini to ensure signals are - ;; properly handled and zombie processes reaped. (match (primitive-fork) (0 ;child process - (set-child-subreaper!) - ;; Use tini so that signals are properly handled and - ;; doubly-forked processes get reaped; otherwise, - ;; python-dbusmock would waste time polling for the dbus - ;; processes it spawns to be reaped, in vain. - (apply execlp "tini" "--" - "meson" "--" "test" "-t" "0" "--print-errorlogs" + (apply execlp "meson" "meson" + "test" "-t" "0" "--print-errorlogs" test-options)) - (pid - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (error "`meson test' exited with status" - status)))))))))))) + (meson-pid + ;; Reap child processes; otherwise, python-dbusmock would + ;; waste time polling for the dbus processes it spawns to + ;; be reaped, in vain. + (let loop () + (match (waitpid WAIT_ANY) + ((pid . status) + (if (= pid meson-pid) + (unless (zero? status) + (error "`meson test' exited with status" + status)) + (loop))))))))))))) (inputs (list duktape expat elogind linux-pam nspr)) (propagated-inputs @@ -162,8 +158,7 @@ (define-public polkit perl pkg-config python - python-dbusmock - tini)) + python-dbusmock)) (home-page "https://www.freedesktop.org/wiki/Software/polkit/") (synopsis "Authorization API for privilege management") (description "Polkit is an application-level toolkit for defining and From patchwork Fri Oct 13 15:47:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 54806 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 CCF2727BBEA; Fri, 13 Oct 2023 16:49:21 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 9C24A27BBE9 for ; Fri, 13 Oct 2023 16:49:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrKPb-0008VV-CQ; Fri, 13 Oct 2023 11:49:15 -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 1qrKP8-0008Hu-DB for guix-patches@gnu.org; Fri, 13 Oct 2023 11:48:47 -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 1qrKP4-0005rt-8n for guix-patches@gnu.org; Fri, 13 Oct 2023 11:48:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qrKPR-0007OF-AR for guix-patches@gnu.org; Fri, 13 Oct 2023 11:49:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH 7/7] gnu: public-inbox: Remove dependency on (guix build syscalls). Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Oct 2023 15:49:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66525 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66525@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 66525-submit@debbugs.gnu.org id=B66525.169721212928241 (code B ref 66525); Fri, 13 Oct 2023 15:49:05 +0000 Received: (at 66525) by debbugs.gnu.org; 13 Oct 2023 15:48:49 +0000 Received: from localhost ([127.0.0.1]:47177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKPA-0007LJ-J0 for submit@debbugs.gnu.org; Fri, 13 Oct 2023 11:48:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrKP5-0007JI-O0 for 66525@debbugs.gnu.org; Fri, 13 Oct 2023 11:48:44 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrKOd-0005oI-Ci; Fri, 13 Oct 2023 11:48:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=oij6i0L6hrxdxWQlkZ1CEWG5HyoXNSx5iCzKSYZGwXw=; b=exn/Sr3doTPsorlC2eRA +MLUUPF5ONP5EiMd4o2HdhD7Ds/IkydkIcTU/0FMkqCJ1Lr15l/9ksMMrPjmfoEOsHOr29mwd6/7g 2BztVmd2rKmcDBtXY05q8GCqX5Zr3ZWkOQfsQBMwwqaOCjwEtc9MF3Aslk5qNFUrSccodS1zHuWPa i7DFuVwa1wl+TvXzo/YjrP8GloicwBK5EJqvQRFK0b6HxBVzDaQi8q+2xmmRqVj1oNypPQGcKI+4y 076EeXoHEqC52hnBNaMiM8vdfyVp7TZyunABeLI7n1gV/YT+TNhRecmlPtfwCwnZGA3n1f226QrBU Vw7G63Xy+PqXtQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 13 Oct 2023 17:47:50 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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/mail.scm (public-inbox)[arguments]: Remove #:imported-modules. Remove (guix build syscalls) from #:modules. Rewrite ‘check’ phase to reap processes from the build process. [native-inputs]: Remove TINI. --- gnu/packages/mail.scm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index be458a2d92..fc5cde38ce 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2013-2021, 2023 Ludovic Courtès ;;; Copyright © 2014, 2015, 2017, 2020 Mark H Weaver ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2014 Sou Bunnbu @@ -4242,10 +4242,7 @@ (define-public public-inbox (file-name (git-file-name name version)))) (build-system perl-build-system) (arguments - `(#:imported-modules (,@%perl-build-system-modules - (guix build syscalls)) - #:modules ((guix build perl-build-system) - (guix build syscalls) + `(#:modules ((guix build perl-build-system) (guix build utils) (ice-9 match)) #:phases @@ -4282,18 +4279,20 @@ (define-public public-inbox (setenv "TMP" "/tmp") (setenv "TMPDIR" "/tmp") - ;; Use tini so that signals are properly handled and - ;; doubly-forked processes get reaped; otherwise, - ;; lei-daemon is kept as a zombie and the testsuite - ;; fails thinking that it didn't quit as it should. - (set-child-subreaper!) - (apply execlp "tini" "--" + (apply execlp "make" "make" "check" test-flags)) - (pid - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (error "`make check' exited with status" status)))))) + (make-pid + ;; Reap child processes; otherwise, lei-daemon is kept as + ;; a zombie and the testsuite fails thinking that it + ;; didn't quit as it should. + (let loop () + (match (waitpid WAIT_ANY) + ((pid . status) + (if (= pid make-pid) + (unless (zero? status) + (error "`make check' exited with status" + status)) + (loop))))))) (format #t "test suite not run~%")))) (add-after 'install 'wrap-programs (lambda* (#:key inputs outputs #:allow-other-keys) @@ -4313,7 +4312,7 @@ (define-public public-inbox (find-files (string-append out "/bin"))))))))) (native-inputs (list ;; For testing. - lsof openssl tini)) + lsof openssl)) (inputs (append (if (not (target-64bit?))