From patchwork Sun Apr 4 09:52:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 28317 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 9B95C27BC68; Sun, 4 Apr 2021 10:58:47 +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_H4,RCVD_IN_MSPIKE_WL,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 2FBE427BC66 for ; Sun, 4 Apr 2021 10:58:47 +0100 (BST) Received: from localhost ([::1]:57428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSzWo-00057q-AA for patchwork@mira.cbaines.net; Sun, 04 Apr 2021 05:58:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSzRH-0003oT-EJ for guix-patches@gnu.org; Sun, 04 Apr 2021 05:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51573) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lSzRG-0000Ng-Ht for guix-patches@gnu.org; Sun, 04 Apr 2021 05:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lSzRG-00032V-GO for guix-patches@gnu.org; Sun, 04 Apr 2021 05:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47591] [PATCH] import: go: Replace underscores with hyphens in package names. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Apr 2021 09:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47591@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161752993411618 (code B ref -1); Sun, 04 Apr 2021 09:53:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Apr 2021 09:52:14 +0000 Received: from localhost ([127.0.0.1]:34886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lSzQT-00031K-Uz for submit@debbugs.gnu.org; Sun, 04 Apr 2021 05:52:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:56246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lSzQR-00031C-Rl for submit@debbugs.gnu.org; Sun, 04 Apr 2021 05:52:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSzQR-0003Yw-I3 for guix-patches@gnu.org; Sun, 04 Apr 2021 05:52:11 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:52340 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSzQP-0008Fi-M5 for guix-patches@gnu.org; Sun, 04 Apr 2021 05:52:11 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1617529924; bh=M/wrnEA///f8Hb/vp0HyAeK9M8hPlCbjbjl7xxtCQ2c=; h=From:To:Subject:Date; b=NFKvEcZkxEPASRxj3EoFogXqRXozzlCkHM0lnTKSOaZ5WTcTjcZEszLAs0KYJPfAW Un/5NEL9ABwEEbPZOgpyRJEzXURKGhIzOwkaTMOdwVieP9NijtGRwduOODd5QiYX1E AHnKT79QiidQM/K6+jBO7m+aQbQbPoP8APHao8Uc= Message-Id: Date: Sun, 04 Apr 2021 11:52:03 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 14 X-Spam_score: 1.4 X-Spam_bar: + X-Spam_report: (1.4 / 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, FROM_SUSPICIOUS_NTLD=0.5, FROM_SUSPICIOUS_NTLD_FP=0.001, PDS_OTHER_BAD_TLD=1.999, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 As per section '16.4.2 Package Naming' in the manual, use hypens instead of underscores in package names. * guix/import/go.scm (go-module->guix-package-name): Replace underscores with hyphens. --- Maybe we should also make the linter check for underscores in package names, and give a warning if it finds any underscores? guix/import/go.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) base-commit: 86617c92c6a795668b2eca3d3c3b285cb742cb24 diff --git a/guix/import/go.scm b/guix/import/go.scm index 7452b4c903..6c0231e113 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021 François Joulaud ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -380,9 +381,11 @@ hence the need to derive this information." "Converts a module's path to the canonical Guix format for Go packages." (string-downcase (string-append "go-" (string-replace-substring (string-replace-substring - module-path - "." "-") - "/" "-")))) + (string-replace-substring + module-path + "." "-") + "/" "-") + "_" "-")))) (define-record-type (make-module-meta import-prefix vcs repo-root)