From patchwork Fri Aug 13 03:48:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 32094 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 40C4B27BC82; Fri, 13 Aug 2021 04:50:11 +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 01EE927BC78 for ; Fri, 13 Aug 2021 04:50:11 +0100 (BST) Received: from localhost ([::1]:55090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEOCw-0000Bu-08 for patchwork@mira.cbaines.net; Thu, 12 Aug 2021 23:50:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEOCo-0000BP-A0 for guix-patches@gnu.org; Thu, 12 Aug 2021 23:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEOCo-0002Ks-34 for guix-patches@gnu.org; Thu, 12 Aug 2021 23:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mEOCn-0002lo-KB for guix-patches@gnu.org; Thu, 12 Aug 2021 23:50:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50037] [PATCH 1/2] gnu: go-github-com-zalando-go-keyring: Update to 0.1.1. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Aug 2021 03:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50037@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162882655010573 (code B ref -1); Fri, 13 Aug 2021 03:50:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Aug 2021 03:49:10 +0000 Received: from localhost ([127.0.0.1]:40214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mEOBx-0002kT-JU for submit@debbugs.gnu.org; Thu, 12 Aug 2021 23:49:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:42592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mEOBt-0002kI-1V for submit@debbugs.gnu.org; Thu, 12 Aug 2021 23:49:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEOBs-00009K-Nu for guix-patches@gnu.org; Thu, 12 Aug 2021 23:49:04 -0400 Received: from out1.migadu.com ([2001:41d0:2:863f::]:24835) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEOBo-0001SN-JC for guix-patches@gnu.org; Thu, 12 Aug 2021 23:49:03 -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=1628826536; 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=5Zi5Y8G5btUrSjIatwZ4IxV1IhbxFECrSfn6ROWFfp0=; b=FWb+r9RH+Muj/5QRWEjg4VWIUCZrjkmaM4YP3T7YO0uTDMx95Vcc5hNexJZ3DagH34lv2z KLiUpF9eguuXxrKVl+scZi1Wj+Rxx3RHLdzbPZ3A5Mc7Qo+BqKFCJ6EsZWXA6OUNmdPtLi PiGzV1oH5CW6Tqy2KDYQZ/84f5jdLR8= From: Sarah Morgensen Date: Thu, 12 Aug 2021 20:48:54 -0700 Message-Id: <24ab383829c10cf04feb1eac68c428316ad8b88b.1628826367.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=2001:41d0:2:863f::; envelope-from=iskarian@mgsn.dev; helo=out1.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, 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 The import path for godbus-dbus-v5 changed, so update it with the corresponding update for its only dependent. (Chezmoi only depends on godbus-dbus-v5 through this package.) * gnu/packages/golang.scm (go-github-com-zalando-go-keyring): Update to 0.1.1. (go-github-com-godbus-dbus-v5)[arguments]: Use correct import-path. --- This depends on the go-github-com-godbus-dbus -> go-github-com-godbus-dbus-v5 rename in #50035. I didn't want to hide this update in the patchset, though. I've also propagated an input that should have been. -- Sarah gnu/packages/golang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) base-commit: d87d6d68128c53a95fe09c3a4381575646c0f368 prerequisite-patch-id: 1f54f3d65c26fb7f2f39078e074b863fa65cc6cb prerequisite-patch-id: ea7dd7cdb43fc04fa7b2962cd3b4687b67c2ae6d prerequisite-patch-id: d30707c981be14dacef30da2b4994ce64e174ac6 diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 28ead635f2..3722e48552 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7445,7 +7445,7 @@ and @code{ioutil} packages that is easy to test.") "0znax8kskb5gmp5fj75w56bc9p7b22wrdswzlh4d04sprlc471yi")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/godbus/dbus" + `(#:import-path "github.com/godbus/dbus/v5" #:phases (modify-phases %standard-phases (replace 'check @@ -7463,7 +7463,7 @@ bindings for the D-Bus message bus system.") (define-public go-github-com-zalando-go-keyring (package (name "go-github-com-zalando-go-keyring") - (version "0.1.0") + (version "0.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -7472,7 +7472,7 @@ bindings for the D-Bus message bus system.") (file-name (git-file-name name version)) (sha256 (base32 - "0kj54nkiyccy6m9iy9a53f6412a54xk96j88jaiq35yzdgfa4z3p")))) + "1wqv6d5b3bc7ymkarp761ivbq71q5a6cc9a27dk3gf772k9in0jf")))) (build-system go-build-system) (arguments `(#:tests? #f ;XXX: Fix dbus tests From patchwork Fri Aug 13 04:01:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 32095 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 BF78C27BC82; Fri, 13 Aug 2021 05:03:09 +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 8390C27BC78 for ; Fri, 13 Aug 2021 05:03:09 +0100 (BST) Received: from localhost ([::1]:57806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEOPU-0002uP-HT for patchwork@mira.cbaines.net; Fri, 13 Aug 2021 00:03:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEOPO-0002uG-MJ for guix-patches@gnu.org; Fri, 13 Aug 2021 00:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56910) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEOPO-000508-Fs for guix-patches@gnu.org; Fri, 13 Aug 2021 00:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mEOPO-00037F-CC for guix-patches@gnu.org; Fri, 13 Aug 2021 00:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50037] [PATCH 2/2] gnu: go-github-com-zalando-go-keyring: Fix inputs. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Aug 2021 04:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50037@debbugs.gnu.org Received: via spool by 50037-submit@debbugs.gnu.org id=B50037.162882732611906 (code B ref 50037); Fri, 13 Aug 2021 04:03:02 +0000 Received: (at 50037) by debbugs.gnu.org; 13 Aug 2021 04:02:06 +0000 Received: from localhost ([127.0.0.1]:40223 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mEOOP-00035h-S5 for submit@debbugs.gnu.org; Fri, 13 Aug 2021 00:02:05 -0400 Received: from out1.migadu.com ([91.121.223.63]:28306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mEOOK-00035S-2X for 50037@debbugs.gnu.org; Fri, 13 Aug 2021 00:02:00 -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=1628827314; 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=CVoWcCS226+J7M/xKwy+BrGvB22okK6j4OI8SyNeBQ4=; b=eCVeK9cLWyYQjIKO+zmpkAVck24ncSQx5ZT03bsy6HJ3L3SsjDw7jdfp9WGgOqnsHXwF7w VxYJQP1DYABIZrXi+gH8Lf42KdXUCEMgRTyqrzh3KNnWepkJTTFItFq6Kn6A7TLsBjk1y+ uQ+HJoTjwzqzdN1WfOVvRCibGDRNcTE= From: Sarah Morgensen Date: Thu, 12 Aug 2021 21:01:52 -0700 Message-Id: <29e8a41b121d1067a4a7eee7f746dd45f5a8cd91.1628826367.git.iskarian@mgsn.dev> In-Reply-To: <24ab383829c10cf04feb1eac68c428316ad8b88b.1628826367.git.iskarian@mgsn.dev> References: <24ab383829c10cf04feb1eac68c428316ad8b88b.1628826367.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 Go source inputs should be propagated in non-end-user packages. * gnu/packages/golang.scm (go-github-com-zalando-go-keyring) [native-inputs]: Move go-github-com-godbus-dbus-v5 to... [propagated-inputs]: ...here. * gnu/packages/configuration-management.scm (chezmoi)[native-inputs]: Remove unnecessary go-github-com-godbus-dbus-v5. --- gnu/packages/configuration-management.scm | 1 - gnu/packages/golang.scm | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 8b4ba2b71e..742bc3505d 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -91,7 +91,6 @@ ("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-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 3722e48552..f8060ccacf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7477,9 +7477,10 @@ bindings for the D-Bus message bus system.") (arguments `(#:tests? #f ;XXX: Fix dbus tests #:import-path "github.com/zalando/go-keyring")) + (propagated-inputs + `(("go-github-com-godbus-dbus-v5" ,go-github-com-godbus-dbus-v5))) (native-inputs - `(("go-github-com-godbus-dbus-v5" ,go-github-com-godbus-dbus-v5) - ("dbus" ,dbus))) + `(("dbus" ,dbus))) (home-page "https://github.com/zalando/go-keyring/") (synopsis "Library for working with system keyring") (description "@code{go-keyring} is a library for setting, getting and