From patchwork Fri Aug 13 03:06:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 32091 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 A80BD27BC82; Fri, 13 Aug 2021 04:09:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6FF7C27BC78 for ; Fri, 13 Aug 2021 04:09:14 +0100 (BST) Received: from localhost ([::1]:45926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mENZJ-0000mb-FF for patchwork@mira.cbaines.net; Thu, 12 Aug 2021 23:09:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mENYB-0007Ja-A3 for guix-patches@gnu.org; Thu, 12 Aug 2021 23:08:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56857) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mENYA-00085P-QJ for guix-patches@gnu.org; Thu, 12 Aug 2021 23:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mENYA-0001e7-J4 for guix-patches@gnu.org; Thu, 12 Aug 2021 23:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50035] [PATCH 1/3] gnu: go-github-com-godbus-dbus: Update to 5.0.4. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Aug 2021 03:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50035@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16288240396272 (code B ref -1); Fri, 13 Aug 2021 03:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Aug 2021 03:07:19 +0000 Received: from localhost ([127.0.0.1]:40170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mENXS-0001d6-Ms for submit@debbugs.gnu.org; Thu, 12 Aug 2021 23:07:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:56906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mENXO-0001cu-2b for submit@debbugs.gnu.org; Thu, 12 Aug 2021 23:07:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mENXL-00060k-5I for guix-patches@gnu.org; Thu, 12 Aug 2021 23:07:12 -0400 Received: from out2.migadu.com ([188.165.223.204]:48319) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mENXF-0007Ek-Fb for guix-patches@gnu.org; Thu, 12 Aug 2021 23:07:10 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1628824021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=CaK1yVE4tEEKbvDZ0U5lRwO50914FRg27YEdPBptqR4=; b=PCodGaNaBRM3v+eN12e2h+RujiNeAE2ToOmTLu4+/8pURFasgq4RGxqRv6QJOi+2YI2rKM UZb/gb2uLFcEHAdS/IhbWp43Lda+w+F40PRM0fgXMLZLR+jK44KTcWLJvHoYq4/KNpyqe4 DOa3fjUjFLq74OfRQAyzCOP4H01ZCxs= From: Sarah Morgensen Date: Thu, 12 Aug 2021 20:06:57 -0700 Message-Id: <5d1fcc896c0f6f63e1664f0eadabf73f0965110b.1628823527.git.iskarian@mgsn.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev Received-SPF: pass client-ip=188.165.223.204; envelope-from=iskarian@mgsn.dev; helo=out2.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-github-com-godbus-dbus): Update to 5.0.4. --- While I was updating this, I renamed it to match the proper import path (so the Go importer sees this package), and fixed those pesky D-Bus tests. -- Sarah gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: d87d6d68128c53a95fe09c3a4381575646c0f368 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f4cd30c662..15826514bc 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7424,7 +7424,7 @@ and @code{ioutil} packages that is easy to test.") (define-public go-github-com-godbus-dbus (package (name "go-github-com-godbus-dbus") - (version "5.0.3") + (version "5.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -7433,7 +7433,7 @@ and @code{ioutil} packages that is easy to test.") (file-name (git-file-name name version)) (sha256 (base32 - "1bkc904073k807yxg6mvqaxrr6ammmhginr9p54jfb55mz3hfw3s")))) + "0znax8kskb5gmp5fj75w56bc9p7b22wrdswzlh4d04sprlc471yi")))) (build-system go-build-system) (arguments `(#:tests? #f ;no /var/run/dbus/system_bus_socket From patchwork Fri Aug 13 03:12:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 32092 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 7CE0E27BC82; Fri, 13 Aug 2021 04:14:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2BFEF27BC78 for ; Fri, 13 Aug 2021 04:14:08 +0100 (BST) Received: from localhost ([::1]:50406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mENe3-0003wq-8Y for patchwork@mira.cbaines.net; Thu, 12 Aug 2021 23:14:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mENdy-0003wf-Ap for guix-patches@gnu.org; Thu, 12 Aug 2021 23:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56865) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mENdy-0005LL-4h for guix-patches@gnu.org; Thu, 12 Aug 2021 23:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mENdx-0001ne-Tt for guix-patches@gnu.org; Thu, 12 Aug 2021 23:14:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50035] [PATCH 2/3] gnu: Rename go-github-com-godbus-dbus to go-github-com-godbus-dbus-v5. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Aug 2021 03:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50035@debbugs.gnu.org Received: via spool by 50035-submit@debbugs.gnu.org id=B50035.16288243926834 (code B ref 50035); Fri, 13 Aug 2021 03:14:01 +0000 Received: (at 50035) by debbugs.gnu.org; 13 Aug 2021 03:13:12 +0000 Received: from localhost ([127.0.0.1]:40176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mENd6-0001m5-CB for submit@debbugs.gnu.org; Thu, 12 Aug 2021 23:13:12 -0400 Received: from out1.migadu.com ([91.121.223.63]:15504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mENd1-0001li-30 for 50035@debbugs.gnu.org; Thu, 12 Aug 2021 23:13:07 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1628824381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4WLY6MJJS2P74wSigofzNF7KzNkA6kEsXJsA1dLfi68=; b=BH+m+ytUYDXEHWRq4Fc5p759go3/s+kw6mOQRITahQxHwB7S5vQQjOHz2xvu7VwFVdpDRh WVGD2ppgken4hVbe8seHVU1mfx4kdx8pxEyMgiZJCCLbpmo/WGBtxIn90oBOwDCBYfMZmE mtUFhZjh1aCbYDMlGlhRNh7Ev73IOWM= From: Sarah Morgensen Date: Thu, 12 Aug 2021 20:12:58 -0700 Message-Id: <1b0b614cc139e92b3a7f85de4bd9ade96f1678f6.1628823527.git.iskarian@mgsn.dev> In-Reply-To: <5d1fcc896c0f6f63e1664f0eadabf73f0965110b.1628823527.git.iskarian@mgsn.dev> References: <5d1fcc896c0f6f63e1664f0eadabf73f0965110b.1628823527.git.iskarian@mgsn.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev 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" X-getmail-retrieved-from-mailbox: Patches The proper module name now includes "-v5" (see project's go.mod). Change the variable/package name to help the Go importer find it. * gnu/packages/golang.scm (go-github-com-godbus-dbus): Rename to... (go-github-com-godbus-dbus-v5): ...this. (go-github-com-zalando-go-keyring)[native-inputs]: Adjust accordingly. * gnu/packages/configuration-management.scm (chezmoi): Likewise. --- gnu/packages/configuration-management.scm | 2 +- gnu/packages/golang.scm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 9aee13a172..8b4ba2b71e 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -91,7 +91,7 @@ ("go-github-com-twpayne-go-xdg" ,go-github-com-twpayne-go-xdg) ("go-github-com-yuin-goldmark" ,go-github-com-yuin-goldmark) ("go-github-com-zalando-go-keyring" ,go-github-com-zalando-go-keyring) - ("go-github-com-godbus-dbus" ,go-github-com-godbus-dbus) + ("go-github-com-godbus-dbus-v5" ,go-github-com-godbus-dbus-v5) ("go-etcd-io-bbolt" ,go-etcd-io-bbolt) ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-golang-org-x-net" ,go-golang-org-x-net) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 15826514bc..359c5a987d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7421,9 +7421,9 @@ and @code{ioutil} packages that is easy to test.") @uref{freedesktop.org}.") (license license:expat))) -(define-public go-github-com-godbus-dbus +(define-public go-github-com-godbus-dbus-v5 (package - (name "go-github-com-godbus-dbus") + (name "go-github-com-godbus-dbus-v5") (version "5.0.4") (source (origin (method git-fetch) @@ -7464,7 +7464,7 @@ bindings for the D-Bus message bus system.") `(#:tests? #f ;XXX: Fix dbus tests #:import-path "github.com/zalando/go-keyring")) (native-inputs - `(("go-github-com-godbus-dbus" ,go-github-com-godbus-dbus) + `(("go-github-com-godbus-dbus-v5" ,go-github-com-godbus-dbus-v5) ("dbus" ,dbus))) (home-page "https://github.com/zalando/go-keyring/") (synopsis "Library for working with system keyring") From patchwork Fri Aug 13 03:12:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 32093 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 912B227BC82; Fri, 13 Aug 2021 04:14:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 594FA27BC78 for ; Fri, 13 Aug 2021 04:14:10 +0100 (BST) Received: from localhost ([::1]:50480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mENe5-000402-Fr for patchwork@mira.cbaines.net; Thu, 12 Aug 2021 23:14:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mENdy-0003wn-MC for guix-patches@gnu.org; Thu, 12 Aug 2021 23:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56866) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mENdy-0005LS-Fu for guix-patches@gnu.org; Thu, 12 Aug 2021 23:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mENdy-0001nl-Bj for guix-patches@gnu.org; Thu, 12 Aug 2021 23:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50035] [PATCH 3/3] gnu: go-github-com-godbus-dbus-v5: Fix and enable tests. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Aug 2021 03:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50035@debbugs.gnu.org Received: via spool by 50035-submit@debbugs.gnu.org id=B50035.16288243966846 (code B ref 50035); Fri, 13 Aug 2021 03:14:02 +0000 Received: (at 50035) by debbugs.gnu.org; 13 Aug 2021 03:13:16 +0000 Received: from localhost ([127.0.0.1]:40178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mENdA-0001mB-Nj for submit@debbugs.gnu.org; Thu, 12 Aug 2021 23:13:16 -0400 Received: from out1.migadu.com ([91.121.223.63]:15517) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mENd1-0001lp-Rv for 50035@debbugs.gnu.org; Thu, 12 Aug 2021 23:13:07 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1628824383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cCtFxbZgYHMwPEBib9YeWnfgoQ+LAdhvDLLlCaBRN0o=; b=Ze+34eBgYhh3IacKxKT3ZroAwv8qekX1pUYT5n8uNrSVM4FCj8c9p1qxCuYVxwh/Q5n/QY JO04o1mi8k3gHlRT4emMCe850FcZZh8bTS9u7RyE/EQb9dhXXHrQR5GFsDFY+WHFuLrzRy 1H1B3Nyi1dQayFb7RNqxaoho4pXZ2QU= From: Sarah Morgensen Date: Thu, 12 Aug 2021 20:12:59 -0700 Message-Id: In-Reply-To: <5d1fcc896c0f6f63e1664f0eadabf73f0965110b.1628823527.git.iskarian@mgsn.dev> References: <5d1fcc896c0f6f63e1664f0eadabf73f0965110b.1628823527.git.iskarian@mgsn.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev 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" X-getmail-retrieved-from-mailbox: Patches Disable system D-Bus tests. Fix session D-Bus tests by running them within our own session. * gnu/packages/golang.scm (go-github-com-godbus-dbus-v5)[source]: Add snippet to disable system D-Bus tests. [arguments]: Enable tests, override 'check phase to run tests within a dbus session. --- gnu/packages/golang.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 359c5a987d..28ead635f2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7431,13 +7431,27 @@ and @code{ioutil} packages that is easy to test.") (url "https://github.com/godbus/dbus") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + '(begin + ;; Disable tests which require a system D-Bus instance. + (substitute* "conn_test.go" + (("func TestSystemBus") + "func DisabledTestSystemBus") + (("func TestConnectSystemBus") + "func DisabledTestConnectSystemBus")))) (sha256 (base32 "0znax8kskb5gmp5fj75w56bc9p7b22wrdswzlh4d04sprlc471yi")))) (build-system go-build-system) (arguments - `(#:tests? #f ;no /var/run/dbus/system_bus_socket - #:import-path "github.com/godbus/dbus")) + `(#:import-path "github.com/godbus/dbus" + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (invoke "dbus-run-session" "--" "go" "test" import-path))))))) (native-inputs `(("dbus" ,dbus))) ;dbus-launch (home-page "https://github.com/godbus/dbus/")