From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: Re: [PATCH] gnu: Add tcllib. Date: Thu, 11 Feb 2016 22:11:07 +0100 Message-ID: <87wpqbc5qs.fsf@gnu.org> References: <87vb5xeiw8.fsf@gnu.org> <20160211215347.0aac83dd@debian-netbook> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTyWA-0004bL-GL for guix-devel@gnu.org; Thu, 11 Feb 2016 16:11:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTyW7-0000Hg-6d for guix-devel@gnu.org; Thu, 11 Feb 2016 16:11:14 -0500 Received: from lb1-smtp-cloud3.xs4all.net ([194.109.24.22]:34491) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTyW6-0000H5-Ss for guix-devel@gnu.org; Thu, 11 Feb 2016 16:11:11 -0500 In-Reply-To: <20160211215347.0aac83dd@debian-netbook> (Efraim Flashner's message of "Thu, 11 Feb 2016 21:53:47 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Efraim Flashner Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Efraim Flashner writes: Thanks for looking in so much detail! New patch set attached. >> + (native-search-paths >> + (list (search-path-specification > I don't think this needs to be a list Yes, so it seems. Still, I left (list) in for now as I feel uncomfortable changing 40 other packages to remove that extra list, and I am even more hesitant to add a package that is the only exception not using (list) here. > . Also, it should be indented 2 spaces > (I believe) I don't think so. I use Emacs and verified other packages. >> + (files (list (string-append "lib/tcllib" version "")))))) > why the double quote after version? Oops, removed. That was an experiment trying to load the cmdline package. >> + (description "Tcllib, the standard Tcl library, is a collection of >> common utility > utility should be on the next line >> + functions and modules all written in high-level Tcl. >> +") > the ") should be on the previous line Re-indented. > I can't find it on the FSF list (https://www.gnu.org/licenses/license-list.html), > but according to https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing, > the Tcl license is a FSF approved license, so another patch before this one > to add it to the license list would be good. It's possible that I'm wrong, so > if someone else can check me that'd be good. I moved the description to a new tcl/tk license and have all (2) packages use that now. Greetings, Jan --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-guix-Add-tcl-tk-license.patch >From c5dd51d51c8da9862882386749b78d708f3488ae Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 11 Feb 2016 21:28:41 +0100 Subject: [PATCH 1/3] guix: Add tcl/tk license. * guix/licenses.scm (tcl/tk): New variable. --- guix/licenses.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/guix/licenses.scm b/guix/licenses.scm index a43ab43..8979744 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -63,6 +63,7 @@ sgifreeb2.0 silofl1.1 sleepycat + tcl/tk unlicense vim x11 x11-style @@ -388,6 +389,11 @@ at URI, which may be a file:// URI pointing the package's tree." "http://directory.fsf.org/wiki/License:Sleepycat" "https://www.gnu.org/licenses/license-list#BerkeleyDB")) +(define tcl/tk + (license "Tcl/Tk" + "http://www.tcl.tk/software/tcltk/license.html" + "A non-copyleft free software license")) + (define vim (license "Vim" "http://directory.fsf.org/wiki/License:Vim7.2" -- 2.1.4 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-tcl-update-to-use-tcl-tk-license-variable.patch >From 813d5d82cca6f517ab64b818cb4b719610e1dbb7 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 11 Feb 2016 21:52:33 +0100 Subject: [PATCH 2/3] gnu: tcl: update to use tcl/tk license variable. --- gnu/packages/tcl.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 2c4c750..ff487a8 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -80,8 +80,7 @@ (home-page "http://www.tcl.tk/") (synopsis "The Tcl scripting language") (description "The Tcl (Tool Command Language) scripting language.") - (license (non-copyleft "http://www.tcl.tk/software/tcltk/license.html" - "Tcl/Tk license")))) + (license tcl/tk))) (define-public expect -- 2.1.4 --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0003-gnu-Add-tcllib.patch Content-Transfer-Encoding: quoted-printable >From bb713e33f7ec89931ad2a71f4eb7c079619dbb83 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 9 Feb 2016 20:44:59 +0100 Subject: [PATCH 3/3] gnu: Add tcllib. * gnu/packages/tcl.scm (tcllib): New variable. --- gnu/packages/tcl.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index ff487a8..098a9b6 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -3,6 +3,7 @@ ;;; Copyright =C2=A9 2014, 2015 Mark H Weaver ;;; Copyright =C2=A9 2014 Eric Bavier ;;; Copyright =C2=A9 2016 Efraim Flashner +;;; Copyright =C2=A9 2016 Jan Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -218,3 +219,29 @@ interfaces (GUIs) in the Tcl language.") ;; pTk/license.terms, pTk/license.html_lib, and pTk/Tix.license for ;; details of this license." (license (package-license perl)))) + +(define-public tcllib + (package + (name "tcllib") + (version "1.18") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/" name "/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "05dmrk9qsryah2n17z6z85dj9l9lfyvnsd7faw0p9bs1pp5pwrkj")))) + (build-system gnu-build-system) + (native-inputs + `(("tcl" ,tcl))) + (native-search-paths + (list (search-path-specification + (variable "TCLLIBPATH") + (separator " ") + (files (list (string-append "lib/tcllib" version "")))))) + (home-page "https://core.tcl.tk/tcllib/home") + (synopsis "Standard Tcl Library") + (description "Tcllib, the standard Tcl library, is a collection of com= mon +utility functions and modules all written in high-level Tcl.") + (license (non-copyleft "http://www.tcl.tk/software/tcltk/license.html" + "Tcl/Tk license")))) --=20 2.1.4 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.nl= =20=20 --=-=-=--