On Thu, Feb 11, 2016 at 10:11:07PM +0100, Jan Nieuwenhuizen wrote:
> 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.
Does anyone object to having a slash in the license variable name? I
don't know whether or not its "safe" [0].
I made some minor changes to your patch series.
I made the commit messages match the conventions of the project (mostly
the GNU changelog format AFAIK). I like to search the git log for
examples when I am commiting a type of patch for the first time.
I mentioned the Tcl/Tk project in the license description field.
And I tried to follow the unusual licensing naming convention of
tcl.scm, which I am not familiar with.
Can you check if it works for you? I don't really know how to test this
package.
[0] I'm traumatized by the Bourne shell ;)
>From 818e27dbdd2a033ccf9221ae428a60e54da3f609 Mon Sep 17 00:00:00 2001
Message-Id: <818e27dbdd2a033ccf9221ae428a60e54da3f609.1455253940.git....@famulari.name>
From: Jan Nieuwenhuizen <jann...@gnu.org>
Date: Thu, 11 Feb 2016 21:28:41 +0100
Subject: [PATCH 1/3] licenses: 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..1abb0a1 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 from the Tcl/Tk project"))
+
(define vim
(license "Vim"
"http://directory.fsf.org/wiki/License:Vim7.2";
--
2.6.3
>From b335e6bfa708d9843b81c5067916782147619609 Mon Sep 17 00:00:00 2001
Message-Id: <b335e6bfa708d9843b81c5067916782147619609.1455253940.git....@famulari.name>
In-Reply-To: <818e27dbdd2a033ccf9221ae428a60e54da3f609.1455253940.git....@famulari.name>
References: <818e27dbdd2a033ccf9221ae428a60e54da3f609.1455253940.git....@famulari.name>
From: Jan Nieuwenhuizen <jann...@gnu.org>
Date: Thu, 11 Feb 2016 21:52:33 +0100
Subject: [PATCH 2/3] gnu: tcl: Use tcl/tk license.
* gnu/packages/tcl.scm (tcl)[license]: Use the 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.6.3
>From f51c775e4b22cc84666514e1129a6f260dec35b7 Mon Sep 17 00:00:00 2001
Message-Id: <f51c775e4b22cc84666514e1129a6f260dec35b7.1455253940.git....@famulari.name>
In-Reply-To: <818e27dbdd2a033ccf9221ae428a60e54da3f609.1455253940.git....@famulari.name>
References: <818e27dbdd2a033ccf9221ae428a60e54da3f609.1455253940.git....@famulari.name>
From: Jan Nieuwenhuizen <jann...@gnu.org>
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 | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index ff487a8..d98d2d6 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2014, 2015 Mark H Weaver <m...@netris.org>
;;; Copyright © 2014 Eric Bavier <bav...@member.fsf.org>
;;; Copyright © 2016 Efraim Flashner <efr...@flashner.co.il>
+;;; Copyright © 2016 Jan Nieuwenhuizen <jann...@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -218,3 +219,28 @@ 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 common
+utility functions and modules all written in high-level Tcl.")
+ (license (package-license tcl))))
--
2.6.3
