From patchwork Sun Oct 22 13:43:25 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: 55120 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 0A55527BBE2; Sun, 22 Oct 2023 14:45:11 +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 0C86D27BBEB for ; Sun, 22 Oct 2023 14:45:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quYkv-0004De-Jd; Sun, 22 Oct 2023 09:44:37 -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 1quYkt-0004Bl-GE for guix-patches@gnu.org; Sun, 22 Oct 2023 09:44:35 -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 1quYkt-0003RC-8O for guix-patches@gnu.org; Sun, 22 Oct 2023 09:44:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quYlK-0000a4-Ql; Sun, 22 Oct 2023 09:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH v2 01/10] 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: Sun, 22 Oct 2023 13:45: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.16979822702064 (code B ref 66525); Sun, 22 Oct 2023 13:45:02 +0000 Received: (at 66525) by debbugs.gnu.org; 22 Oct 2023 13:44:30 +0000 Received: from localhost ([127.0.0.1]:45681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYkn-0000X9-FJ for submit@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYkl-0000Wl-L1 for 66525@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:28 -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 1quYkD-0003I6-UX; Sun, 22 Oct 2023 09:43:53 -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=Xv7o402aR61dbohBxM6uRabw+HjchZgutVA3W2QebzI=; b=oGluH4Cu8X302v7k5IzT pQvmEue8KVNa2RSCpDps2fdVMy48fDfOC1JcPOh4GrtfN5NK5jrs011cKWBOVBXP5vzYnR+Oo/srd c0Y4JQaB7t6fEh3Xg8wcowR5/FZB3TxtuAuFOJipjxuq3aosoSQQsZhNvGmk7nUeYqimo2zxjIlJj iDiJb0YWla6ffZ6+ySGjF1FACrGCYcAsXravXr7GOjmArR3ha909ZCUiSW5ueupngM9a7gmsl/CDf ahDWe0s7KkfXYgeWgDYAuzEYLC05MM3se1ZVfxwMI1FO5133tGk0kCPXRwczuLI9/N2ga1X8kCH0v hsz1yMwxGLQKUA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 22 Oct 2023 15:43:25 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: <87o7gywndy.fsf@gmail.com> 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 | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2ffe8dfef2..ac3035e07d 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,22 @@ (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 () + ;; 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 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 +7961,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 Sun Oct 22 13:43:26 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: 55121 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 9A05327BBEB; Sun, 22 Oct 2023 14:45:08 +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 0CFB627BBE2 for ; Sun, 22 Oct 2023 14:45:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quYl2-0004Gr-5x; Sun, 22 Oct 2023 09:44:44 -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 1quYl0-0004GG-Mm for guix-patches@gnu.org; Sun, 22 Oct 2023 09:44:42 -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 1quYl0-0003Sl-DK; Sun, 22 Oct 2023 09:44:42 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quYlL-0000aC-7A; Sun, 22 Oct 2023 09:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH v2 02/10] 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: Sun, 22 Oct 2023 13:45: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.16979822792119 (code B ref 66525); Sun, 22 Oct 2023 13:45:03 +0000 Received: (at 66525) by debbugs.gnu.org; 22 Oct 2023 13:44:39 +0000 Received: from localhost ([127.0.0.1]:45695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYkx-0000Y5-3G for submit@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYko-0000Wo-56 for 66525@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:30 -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 1quYkG-0003Iy-FM; Sun, 22 Oct 2023 09:43:56 -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=9LPlbdQcwXf4BiJ+nb2anmf1jXqqT5QKu9P1j7UcGKM=; b=j5cYOxT9NQJBS51m45i3 w31aNM532Vxggt/A0KTCnZfnHvgppVpEYitR2XqNAeVGU+0Iy5cFQudTKJ/1ICZyn49E7wlQzAu/g fS0WYb/+lx2hnYcmVYDOgAm58caDGuXesE24vzkAUtkN815SRefpjlKU3D52a/RDaTC5Pt1qV6056 blNRpCe32LLxK39mkmA6SSjWfjNH6hUWGWnEMuANIJxuqXI02uD6oEm37gXWrySPcNGkGZt3a7o8G bGj9q3qNPkGetGOLYOVN/bZdli5+6G0EnQVwue47NP59clb36p9S/d1xNy1cPXUxpN8Oief7pL8Jf cDIs3J8fWYwbPg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 22 Oct 2023 15:43:26 +0200 Message-ID: <57121aa0458c061c023a104ee5775897167ace8b.1697982039.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: <87o7gywndy.fsf@gmail.com> 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 29ac11df95..d094c6e451 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10660,10 +10660,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 @@ -10682,20 +10679,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 @@ -10724,8 +10720,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 Sun Oct 22 13:43:27 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: 55116 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 AF8E727BBEA; Sun, 22 Oct 2023 14:44: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=-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 0151927BBE2 for ; Sun, 22 Oct 2023 14:44:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quYl0-0004GO-UW; Sun, 22 Oct 2023 09:44:42 -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 1quYl0-0004G4-9c for guix-patches@gnu.org; Sun, 22 Oct 2023 09:44:42 -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 1quYl0-0003Sm-1i; Sun, 22 Oct 2023 09:44:42 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quYlM-0000aQ-2M; Sun, 22 Oct 2023 09:45:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH v2 03/10] 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: Sun, 22 Oct 2023 13:45: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.16979822802134 (code B ref 66525); Sun, 22 Oct 2023 13:45:04 +0000 Received: (at 66525) by debbugs.gnu.org; 22 Oct 2023 13:44:40 +0000 Received: from localhost ([127.0.0.1]:45699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYkx-0000YF-Ur for submit@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYkq-0000Wu-3r for 66525@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:32 -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 1quYkH-0003Jc-Cf; Sun, 22 Oct 2023 09:43:57 -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=qdQabaGhUMAPoeoz0tmsyiK383qlGZbfSUJaXyj02go=; b=l8jBH+L+j7i+PaoXU0J4 mdJP3N4TOOxPP4Pxi9DIxCuvYxWhtb0z3ehgYMT+x5TI/qedpBx/oDdmOS04U9u9pTX0UrLXWsKiM C70aFa1Lv+6RoAabtucjAldqFNerVVSJo+9Crjb9M3Fz0/ojdFASXb5BzXVpYNlD9IP6FdZuG55XE YUPQ6ho+cYRfAfRss0oAfGgpze1WNP9yUf4OTj7aunk+xzmI51KFADgWAlqr7lbDVzZzDBA5Zzbzj ckIdN8a3g72qP8vxyej1HdV7z8pWzwBUyHI9u9WuRAQrVU27ioHBcoP5oIueGBSyX8wbnR3oaGr5C B7ObKIOS9OdJHQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 22 Oct 2023 15:43:27 +0200 Message-ID: <230e6b36d03b8cd45295fddf8706c7272d09011f.1697982039.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: <87o7gywndy.fsf@gmail.com> 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 d094c6e451..782d1fae6f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27165,12 +27165,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 @@ -27186,20 +27184,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 Sun Oct 22 13:43:28 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: 55119 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 9662D27BBEA; Sun, 22 Oct 2023 14:45:07 +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 AB60A27BBE2 for ; Sun, 22 Oct 2023 14:45:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quYl2-0004Gx-Oa; Sun, 22 Oct 2023 09:44:44 -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 1quYl0-0004GI-Ob for guix-patches@gnu.org; Sun, 22 Oct 2023 09:44:42 -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 1quYl0-0003Sv-GY; Sun, 22 Oct 2023 09:44:42 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quYlL-0000aI-Jx; Sun, 22 Oct 2023 09:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH v2 04/10] 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: Sun, 22 Oct 2023 13:45: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.16979822802126 (code B ref 66525); Sun, 22 Oct 2023 13:45:03 +0000 Received: (at 66525) by debbugs.gnu.org; 22 Oct 2023 13:44:40 +0000 Received: from localhost ([127.0.0.1]:45697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYkx-0000Y8-G6 for submit@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYkp-0000Wq-Tk for 66525@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:32 -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 1quYkI-0003K0-7o; Sun, 22 Oct 2023 09:43:58 -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=YzEebFsXxekEB2V9Q4WMjdNCH0lylHUFV+nxvtg9y8I=; b=VWk7b5O2gF+floMQoceS dgzBbNGGJ5HQ9WRBhEJ00sTEppysr1JcNw0r+FUJ5BLCF1tuiRRlZTSFIPSFO/THxqM74hyITO3F4 QZeMdoiUoUebjPK39sTJcHRJEJ2q3JG/xbHG3EgOfALXLFqLk2SVKm5FQ6aBU/QTsRk6RC8c55OEi 2pn2CIQGWGt2nn5jTyM7CH0Nv/VbA3S3mc8kuJr/VKizEth7YZNKbdBJ/wMpdq6Z9q3j6Q2rmHgq9 6WXrtvI2+QxWQ2nYMA5sHcyWRJt92hsxjXzzWMqCBgXZBqt4FBHWFJk6gIvbR73q1RKMfkloTaLti NHud0/qRdra6vQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 22 Oct 2023 15:43:28 +0200 Message-ID: <48b4d13af78919c35ae4389fb46fd1c124a7bc30.1697982039.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: <87o7gywndy.fsf@gmail.com> 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 782d1fae6f..4929c6dcc7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27165,37 +27165,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 Sun Oct 22 13:43:29 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: 55118 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 C70C427BBEA; Sun, 22 Oct 2023 14:45:03 +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 32E0427BBE2 for ; Sun, 22 Oct 2023 14:45:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quYkx-0004FZ-Gk; Sun, 22 Oct 2023 09:44:39 -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 1quYkw-0004EK-1G for guix-patches@gnu.org; Sun, 22 Oct 2023 09:44:38 -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 1quYkv-0003Re-Of; Sun, 22 Oct 2023 09:44:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quYlM-0000aW-G5; Sun, 22 Oct 2023 09:45:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH v2 05/10] gnu: python-dbusmock: Use =?utf-8?b?4oCYc2VhcmNoLWlucHV0LWZpbGXigJku?= 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: Sun, 22 Oct 2023 13:45: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.16979822802141 (code B ref 66525); Sun, 22 Oct 2023 13:45:04 +0000 Received: (at 66525) by debbugs.gnu.org; 22 Oct 2023 13:44:40 +0000 Received: from localhost ([127.0.0.1]:45701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYky-0000YM-AM for submit@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYkr-0000X4-Oq for 66525@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:34 -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 1quYkK-0003LC-2B; Sun, 22 Oct 2023 09:44:00 -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=HW6nniIQsHonNy0gH3c1oU/kIIptD1Dv0IBcBbpkiGM=; b=aTNHQATmIT/G0xTAz2Zc 6Rojp0KPMPiYdKLea7y/3B80KRpcKhKFs5ERcUEUd47SNbbu5N8p15mrHFpnzum6z/y9UCYCEesTz 4FQ+glHJoyOGm7als3YeSzKcivAd4/c43wpzWN0Z6oDBmg2B/ZizjvkUeBgE2InNwQbkrgSVPBFHa Ak6qH/tysJfMqQTMcHoq8kV70Qh/L405Jgbqtl/Iqouq2mlxDD3DlhGvhUq+RfMx5DMlwfKqbTc3V IShvD9WyQdyBkm5lhipPGdosw5bCtmCr7dpixtj8AIfUv9PwuYo/bWPxhjk/ysZCegDZY3uJwBAuQ xylFOOcER74AOg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 22 Oct 2023 15:43:29 +0200 Message-ID: <1ad6565e4a0516ee89d1d14b84ac062f670c347d.1697982040.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: <87o7gywndy.fsf@gmail.com> 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 4929c6dcc7..65c23cb318 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27178,8 +27178,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 Sun Oct 22 13:43:30 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: 55117 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 D678927BBEA; Sun, 22 Oct 2023 14:45:00 +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 17B8727BBE2 for ; Sun, 22 Oct 2023 14:45:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quYkw-0004El-MV; Sun, 22 Oct 2023 09:44:38 -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 1quYku-0004CA-QR for guix-patches@gnu.org; Sun, 22 Oct 2023 09:44:36 -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 1quYku-0003RO-IT for guix-patches@gnu.org; Sun, 22 Oct 2023 09:44:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quYlM-0000al-U7 for guix-patches@gnu.org; Sun, 22 Oct 2023 09:45:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH v2 06/10] 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: Sun, 22 Oct 2023 13:45: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.16979822812148 (code B ref 66525); Sun, 22 Oct 2023 13:45:04 +0000 Received: (at 66525) by debbugs.gnu.org; 22 Oct 2023 13:44:41 +0000 Received: from localhost ([127.0.0.1]:45703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYky-0000YU-L5 for submit@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33972) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYkt-0000XS-Oi for 66525@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:36 -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 1quYkM-0003MJ-1e; Sun, 22 Oct 2023 09:44:02 -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=p0NGUjL+DEjDRfnymURC 6p7QSa50mqxzx12/XwC0m4rxhgz6HEjiaofc9ikKDOdETHz5b3gmm3IOOimjXJTrxqDaC88lU3Rtr z+sWi0j6VhK4yoSdObAgUyALEChZqG2WULvz5WNp9dUXbFdZzuPGueXOsUFqt/DYHYy0mXMMbkIg4 mLFPz00y6aVNWvp99RFiX2wH8cl03I1WWHILV0iomxBgCJShn23Gj+LDLHMh6EKagg9UK3yk5vAlb VhwXyO7+2u705RjCGyo4zEI7Phj8wcHsDiLEJ1h0asGA9vPiks42yJ8FVTp1c1hwYh5F2zSFqExgT LwsK6spi73fGhQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 22 Oct 2023 15:43:30 +0200 Message-ID: <9998cd64698ce4e211452306cbd159154d4839ef.1697982040.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: <87o7gywndy.fsf@gmail.com> 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 Sun Oct 22 13:43:31 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: 55122 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 5105127BBE9; Sun, 22 Oct 2023 14:45: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=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 83F9C27BBE2 for ; Sun, 22 Oct 2023 14:45:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quYkx-0004FL-8k; Sun, 22 Oct 2023 09:44:39 -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 1quYkv-0004DR-I8 for guix-patches@gnu.org; Sun, 22 Oct 2023 09:44:37 -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 1quYkv-0003RW-99 for guix-patches@gnu.org; Sun, 22 Oct 2023 09:44:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quYlN-0000as-CI for guix-patches@gnu.org; Sun, 22 Oct 2023 09:45:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH v2 07/10] 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: Sun, 22 Oct 2023 13:45: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.16979822812164 (code B ref 66525); Sun, 22 Oct 2023 13:45:05 +0000 Received: (at 66525) by debbugs.gnu.org; 22 Oct 2023 13:44:41 +0000 Received: from localhost ([127.0.0.1]:45707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYkz-0000Yb-4c for submit@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYkw-0000Xf-74 for 66525@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:38 -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 1quYkO-0003ND-Gq; Sun, 22 Oct 2023 09:44:04 -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=Gn5EN2pK2RAs4MlMnXPo 9OUbdRc1d3VJ25YaN5MCJzN2TESwVNbDnxPqTTpcjUcbL2erJtAlbH/WtYUE3SGLgNzImun883XAW 7HTlj2hFec8mHmcV/0SGeJPQWSvOYwlzLWNOR2XtGePIOlno71Q0LLabRN2t0zwGjK/Y7DoPcYDqW lMCyYyWAssr2KHFk0s5Dk4hBM9PfZLRZAIetT3eHaSQ6MVyft0xN/CgfMIEBPzANtQVI6tNCKqvho hJdsInDZAnLPqjv9B8i1YqvcRd2jCgKbCFM/2rzgU7JV8791py8wdTW6J7lmwDfkgMm8d5m8WRilp fBW3BHxl9JZX4g==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 22 Oct 2023 15:43:31 +0200 Message-ID: <5e7e25542f40bc869303339e54a98705d7dc0331.1697982040.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: <87o7gywndy.fsf@gmail.com> 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?)) From patchwork Sun Oct 22 13:43:32 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: 55123 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 4B22327BBE9; Sun, 22 Oct 2023 14:45: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=-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 1D10B27BBE2 for ; Sun, 22 Oct 2023 14:45:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quYlz-0004v8-MG; Sun, 22 Oct 2023 09:45: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 1quYlr-0004s0-De for guix-patches@gnu.org; Sun, 22 Oct 2023 09:45:35 -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 1quYlp-00047v-QB for guix-patches@gnu.org; Sun, 22 Oct 2023 09:45:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quYmH-0000d8-Un; Sun, 22 Oct 2023 09:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH v2 08/10] build-system/ant: Remove dependency on (guix build syscalls). Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bjoern.hoefling@bjoernhoefling.de, julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Sun, 22 Oct 2023 13:46:01 +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?= , =?utf-8?b?QmrDtnJuIEg=?= =?utf-8?b?w7ZmbGluZw==?= , Julien Lepiller X-Debbugs-Original-Xcc: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= , Julien Lepiller Received: via spool by 66525-submit@debbugs.gnu.org id=B66525.16979823072319 (code B ref 66525); Sun, 22 Oct 2023 13:46:01 +0000 Received: (at 66525) by debbugs.gnu.org; 22 Oct 2023 13:45:07 +0000 Received: from localhost ([127.0.0.1]:45731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYlO-0000bI-V0 for submit@debbugs.gnu.org; Sun, 22 Oct 2023 09:45:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYky-0000Xo-W6 for 66525@debbugs.gnu.org; Sun, 22 Oct 2023 09:44: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 1quYkR-0003NT-9i; Sun, 22 Oct 2023 09:44:07 -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=41Rj2ou7JYNoW/9SCcZaIJzinNwsrpzfCDIoTzqplso=; b=KIKLM3yLzaJRQjqts2w3 qgIdFgWonu2X/jc7YY2f4o1E/2Qxb3bNfpsX+bqxxo32CbI2b+A7+dV9OguTeVP7/JnNX+frmZV/C h5bbKj0qpkwEXVLxFhAEG4bGU3qMRBHoxllvM/XAymCFbHuUFJ8qJxLnQEV7OK3jLMeZmQL4nOBO5 xbWVoqvEikCVDyya2p3TlmYHnFOF7Dc1G8CN86gYjxVEnE0S+QHcAyyg686uYB62R40MHaF6u63f4 gcQHSZVVdp57WZ3aSOEv16YPV2ExE/Lo22lzm74pXJdu0NsE3aLcOOod4hP5qY4UJSe+7xo6I38FD 5whjOR5bcKDWpg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 22 Oct 2023 15:43:32 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: <87o7gywndy.fsf@gmail.com> 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 The module has been unused since a6343af22161b21ddbc4143a2b6a60d1ee860eb0. * guix/build-system/ant.scm (%ant-build-system-modules): Remove (guix build syscalls). --- guix/build-system/ant.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index cfb033f6a5..e191fd3c99 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -43,7 +43,6 @@ (define %ant-build-system-modules (guix build maven plugin) (guix build maven pom) (guix build java-utils) - (guix build syscalls) ,@%gnu-build-system-modules)) (define (default-jdk) From patchwork Sun Oct 22 13:43:33 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: 55125 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 9FAB227BBE9; Sun, 22 Oct 2023 14:46:06 +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 9176C27BBE2 for ; Sun, 22 Oct 2023 14:46:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quYlx-0004uJ-DZ; Sun, 22 Oct 2023 09:45:41 -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 1quYlr-0004s1-EE for guix-patches@gnu.org; Sun, 22 Oct 2023 09:45:35 -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 1quYlq-00048a-1q for guix-patches@gnu.org; Sun, 22 Oct 2023 09:45:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quYmI-0000dG-Ds for guix-patches@gnu.org; Sun, 22 Oct 2023 09:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH v2 09/10] build-system/android-ndk: 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: Sun, 22 Oct 2023 13:46: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?= Received: via spool by 66525-submit@debbugs.gnu.org id=B66525.16979823082328 (code B ref 66525); Sun, 22 Oct 2023 13:46:02 +0000 Received: (at 66525) by debbugs.gnu.org; 22 Oct 2023 13:45:08 +0000 Received: from localhost ([127.0.0.1]:45733 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYlP-0000bM-Kp for submit@debbugs.gnu.org; Sun, 22 Oct 2023 09:45:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYl0-0000Xx-Lm for 66525@debbugs.gnu.org; Sun, 22 Oct 2023 09:44: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 1quYkS-0003Nf-5O; Sun, 22 Oct 2023 09:44:08 -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=yYIdkX/1E1p4np+J7m0idgfyEgOXURRSjfyzU3HGrGM=; b=Xsb9Ddk4MzutcQxGPheW Vw/gSSlvxH3Ew6G7w3zMBg0ycilorvRXYYqO8g3Uxs5tYhPZiqfTsskHQDVu6a4PNbvHkbLhEBdKA mkYdMTMCMve2hz307ntTtvNNGzhsw+7hwP1aLmRCZ2+E7nlzmiUzqJ/rjhx7CVQ5Lf3zwk1jRTK9k UP7Kb+JhjjaENEVLuXEmwTYYSr+8LytK3JCPJ68R/vsKL6X2zu4ohXebGRRvykRvFWU+pzx7rILYP LTjoXG/WswwRQ6+7YnmNFRMfz7FLD5JIB9g3iHl8/R1VZN+zXpXP2GdG9qnxobFvgvEzGmis4HWF0 uS3m/pU5nMiH8Q==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 22 Oct 2023 15:43:33 +0200 Message-ID: <6f1e66ede9331a4f1c66bc3fa3b955f21d0870da.1697982040.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: <87o7gywndy.fsf@gmail.com> 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 The (guix build syscalls) module was unused. * guix/build-system/android-ndk.scm (%android-ndk-build-system-modules): Remove (guix build syscalls). --- guix/build-system/android-ndk.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm index 047f884b19..aa7cc06279 100644 --- a/guix/build-system/android-ndk.scm +++ b/guix/build-system/android-ndk.scm @@ -31,7 +31,6 @@ (define-module (guix build-system android-ndk) (define %android-ndk-build-system-modules ;; Build-side modules imported by default. `((guix build android-ndk-build-system) - (guix build syscalls) ,@%gnu-build-system-modules)) (define* (android-ndk-build name inputs From patchwork Sun Oct 22 13:43:34 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: 55124 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 18D4E27BBE9; Sun, 22 Oct 2023 14:45:59 +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 28B0727BBE2 for ; Sun, 22 Oct 2023 14:45:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quYlz-0004v9-MV; Sun, 22 Oct 2023 09:45: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 1quYlr-0004s3-Eu for guix-patches@gnu.org; Sun, 22 Oct 2023 09:45:35 -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 1quYlq-00048b-Fu for guix-patches@gnu.org; Sun, 22 Oct 2023 09:45:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quYmI-0000dN-RM for guix-patches@gnu.org; Sun, 22 Oct 2023 09:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH v2 10/10] build-system/dub: 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: Sun, 22 Oct 2023 13:46: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?= Received: via spool by 66525-submit@debbugs.gnu.org id=B66525.16979823082334 (code B ref 66525); Sun, 22 Oct 2023 13:46:02 +0000 Received: (at 66525) by debbugs.gnu.org; 22 Oct 2023 13:45:08 +0000 Received: from localhost ([127.0.0.1]:45735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYlP-0000bV-Ud for submit@debbugs.gnu.org; Sun, 22 Oct 2023 09:45:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYl0-0000Xy-RH for 66525@debbugs.gnu.org; Sun, 22 Oct 2023 09:44: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 1quYkT-0003Nh-4r; Sun, 22 Oct 2023 09:44: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=dify/RC6Ihu9U+9tFuFLKAqv2VzdsgdwIQwfautG4Lk=; b=ovpzdUVLSKzN1I1aEYr+ HQTOxZrU3fIGmhvX4wIRyHK37oHgOjcjO3bcQm5AbiQIlTWxhMnaJLAfgy74PlfTFxX/98hSr3E+2 2BbfiPQAXQPPqEuk7kJUurn45nW32xKHG5lTd9y7UwW6UyUPjJ51U4jkNELf9C/k25xuCiiHfPMSz tImoKrQ+oOIZkYqzIMKW0ayJDKyAWaLjxHutqj+iP5URSXyuCqJBR8/eIftDLKemWtCJhwTp7FMAQ wALkPfxiFI6ecAKT2MYTP0zlPsh8QGedkYhb7ZAxjDHl64q/1AUrgEAnhmNil6XEFMJPXz5RWFQrs PzitkmXfDzHxyQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 22 Oct 2023 15:43:34 +0200 Message-ID: <1f926dea6d76e6e41a3275637eb9f2e13bbb2e8d.1697982040.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: <87o7gywndy.fsf@gmail.com> 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 The (guix build syscalls) module was unused. * guix/build-system/dub.scm (%dub-build-system-modules): Remove (guix build syscalls). --- guix/build-system/dub.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/guix/build-system/dub.scm b/guix/build-system/dub.scm index b4011cdb83..951c084398 100644 --- a/guix/build-system/dub.scm +++ b/guix/build-system/dub.scm @@ -59,7 +59,6 @@ (define (default-ld-gold-wrapper) (define %dub-build-system-modules ;; Build-side modules imported by default. `((guix build dub-build-system) - (guix build syscalls) ,@%gnu-build-system-modules)) (define* (dub-build name inputs