diff mbox series

[bug#44176] Acknowledgement (gnu: Add bash-ctypes)

Message ID 86mu0dc585.fsf@163.com
State Accepted
Headers show
Series [bug#44176] Acknowledgement (gnu: Add bash-ctypes) | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job

Commit Message

Zhu Zihao Oct. 23, 2020, 3:49 p.m. UTC 
Push another commit to fix import conflict of name "zlib"

Comments

david larsson Oct. 24, 2020, 7:22 a.m. UTC | #1 
On 2020-10-23 15:49, Zhu Zihao wrote:
> Push another commit to fix import conflict of name "zlib"

Thanks for adding this package!

Though, if you'd rather add a git-fetch version of it, which I think is 
generally preferred over a url-fetch of a tarball so you can more easily 
inherit the package and just update the commit, you could perhaps edit 
from this old version:

https://gitlab.com/methuselah-0/bash-coding-utils.sh/-/blob/master/guix-channel/bash-coding-utils.scm#L81

Best regards,
David
diff mbox series

Patch

From 663104a3945696323d893443a3ab0c96c17e07e3 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
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 <http://www.gnu.org/licenses/>.
 
 (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