From patchwork Fri Oct 23 15:49:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 24766 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 5B03A27BBF1; Fri, 23 Oct 2020 17:41:48 +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, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham 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 793BC27BBF0 for ; Fri, 23 Oct 2020 17:41:47 +0100 (BST) Received: from localhost ([::1]:53446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kW08Q-0004XO-EH for patchwork@mira.cbaines.net; Fri, 23 Oct 2020 12:41:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVzKM-0001A9-Er for guix-patches@gnu.org; Fri, 23 Oct 2020 11:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVzKM-0004Ni-3m for guix-patches@gnu.org; Fri, 23 Oct 2020 11:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kVzKM-000698-28 for guix-patches@gnu.org; Fri, 23 Oct 2020 11:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44176] Acknowledgement (gnu: Add bash-ctypes) Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Oct 2020 15:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44176 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 44176@debbugs.gnu.org Received: via spool by 44176-submit@debbugs.gnu.org id=B44176.160346818423598 (code B ref 44176); Fri, 23 Oct 2020 15:50:02 +0000 Received: (at 44176) by debbugs.gnu.org; 23 Oct 2020 15:49:44 +0000 Received: from localhost ([127.0.0.1]:58059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVzK4-00068V-7t for submit@debbugs.gnu.org; Fri, 23 Oct 2020 11:49:44 -0400 Received: from mail-m974.mail.163.com ([123.126.97.4]:55440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVzJz-00068C-7T for 44176@debbugs.gnu.org; Fri, 23 Oct 2020 11:49:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=O6D93 Nd8fC5+pHahJvTUeSBv5hGIekzlsuGNdV/NH5s=; b=pegomGKVVZTgg/rhIZqpB jrDomz1XpIok+dtIBM5Tg3b+Rmf84y/K01Gt2omceldcu9Dym3d9UbQpmEi8pxDR JdQ3Lzz3kMaj8AmEDrgPjUYWG6cR6oZKbmVywZ3ilm+nz/0HNB/iW3IASG802nMc VUf2iggSVNynE/wooR86p4= Received: from asus-laptop (unknown [27.39.88.45]) by smtp4 (Coremail) with SMTP id HNxpCgB3ff+K+5Jf_UmIVg--.20702S2; Fri, 23 Oct 2020 23:49:31 +0800 (CST) References: <86wnzhm7e2.fsf@163.com> <86mu0dm65b.fsf@163.com> <861rhpdk9w.fsf@163.com> User-agent: mu4e 1.4.13; emacs 27.1 From: Zhu Zihao In-reply-to: <861rhpdk9w.fsf@163.com> Date: Fri, 23 Oct 2020 23:49:30 +0800 Message-ID: <86mu0dc585.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: HNxpCgB3ff+K+5Jf_UmIVg--.20702S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RJEfoUUUUU X-Originating-IP: [27.39.88.45] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiTwvGr1sGWMH-ggAAsU 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 Push another commit to fix import conflict of name "zlib" From 663104a3945696323d893443a3ab0c96c17e07e3 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 23 Oct 2020 23:43:05 +0800 Subject: [PATCH 2/2] gnu: Use prefix "license:" to import (guix licenses) * gnu/packages/bash.scm (bash, bash-completion, bash-tap, bats, bash-ctypes)[license]: Rename with prefix "license:". --- gnu/packages/bash.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index f7d3cd2892..59f6e7fc69 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -23,7 +23,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages bash) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) @@ -215,7 +215,7 @@ from the Korn Shell and the C Shell and new improvements of its own. It allows command-line editing, unlimited command history, shell functions and aliases, and job control while still allowing most sh scripts to be run without modification.") - (license gpl3+) + (license license:gpl3+) (home-page "https://www.gnu.org/software/bash/")))) (define-public bash-minimal @@ -325,7 +325,7 @@ without modification.") "This package provides extensions that allow Bash to provide adapted completion for many common commands.") (home-page "https://github.com/scop/bash-completion") - (license gpl2+))) + (license license:gpl2+))) (define-public bash-tap (package @@ -369,7 +369,7 @@ test library") for Bash shell scripts and functions. Along with the Test::More-style testing helpers it provides helper functions for mocking commands and in-process output capturing.") - (license expat))) + (license license:expat))) (define-public bats (package @@ -419,7 +419,7 @@ capturing.") framework for Bash. It provides a simple way to verify that the UNIX programs you write behave as expected. Bats is most useful when testing software written in Bash, but you can use it to test any UNIX program.") - (license expat))) + (license license:expat))) (define-public bash-ctypes (package @@ -447,4 +447,4 @@ in Bash, but you can use it to test any UNIX program.") (description "Bash-ctypes is a bash plugin that provides a foreign function interface directly in your shell. In other words, it allows you to call routines in shared libraries from within bash.") - (license expat))) + (license license:expat))) -- 2.28.0