From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id PIFoL4HjFWEPsAAAgWs5BA (envelope-from ) for ; Fri, 13 Aug 2021 05:14:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id SHF7KoHjFWG9PAAAbx9fmQ (envelope-from ) for ; Fri, 13 Aug 2021 03:14:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id ED6EC19972 for ; Fri, 13 Aug 2021 05:14:08 +0200 (CEST) Received: from localhost ([::1]:50406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mENe4-0003wq-25 for larch@yhetil.org; Thu, 12 Aug 2021 23:14:08 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628824449; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=4WLY6MJJS2P74wSigofzNF7KzNkA6kEsXJsA1dLfi68=; b=q3cu5PBfm1a1eI/YtH+Elhbgxx3NpYqa8v+U1dhbP/bY6TfjfXBbUqSTcYCU18Teqru/ed lf+fCPraQLkMDkcBYwSqAP860FvrRJ9HHgSNlyUc+UQVa7XfxaJ42gQ9KNbT6Ffe3/2Bun 49qloe9hNg5MLlQx+v+fJaySNU5CVRvesH0se6L4yPTNRPytfv05zNN939vZsPG/XajkhX Hv8TfTbScFJE4YZXfsue/BY2oPN5qk7QEYP7abINiu3PiCoKQ/e+HNdGb2Q8XzM7D8OCOp aaW+bSfrEAZylth7xhAaX4rNheMYAAn80AjA7D8a/JZVp5RRzoUhlENlfROURA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628824449; a=rsa-sha256; cv=none; b=GZHheEVgazAvqUCaI1s4zrgycCTussOWjZyoEPmoESEoiHI74/At8ghSWNOmPOyzdS0CJ2 DnSMjmW6FTkluSGelv01emdwKz5mZYrFw+QMsvTHmPUbFkn9jEl27c2JUjig/r7W31MznX bTLXR8OcAEDs9g9zz9FKUEMCplbyuCYxflkUZTNwGCaP8yCdNZx80FhTz5EBpJJqbJzWBP bh630orRf92kKOK8QyD0NUa/e2Hymnst+jG7hkvQu9/hDA2mzS2nW71z4Y4CKPqmYPFd/D UH5XjxKk/Dptum/wrEG673limE/5p4HFdw6ln+YxAHLbvKss59yM8lsqLC7beg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=BH+m+ytU; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.69 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=BH+m+ytU; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: ED6EC19972 X-Spam-Score: 3.69 X-Migadu-Scanner: scn1.migadu.com X-TUID: 8eqDUdBevNim 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") -- 2.31.1