[PATCH] gnu: Add tcllib.

[PATCH] gnu: Add tcllib.

[Jan Nieuwenhuizen]

[-- Attachment #1: Type: text/plain, Size: 39 bytes --]

Hi,

A "new" package.

Greetings, Jan


[-- Attachment #2: 0001-gnu-Add-tcllib.patch --]
[-- Type: text/x-diff, Size: 2054 bytes --]

From 51f0b17b38385197240bca37b290730b2fbe5df1 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 9 Feb 2016 20:44:59 +0100
Subject: [PATCH] gnu: Add tcllib.

    * gnu/packages/tcl.scm (tcllib): New variable.
---
 gnu/packages/tcl.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index 2c4c750..8d6059d 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -219,3 +220,33 @@ 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 (non-copyleft "http://www.tcl.tk/software/tcltk/license.html"
+			   "Tcl/Tk license"))))
+
+
+
-- 
2.1.4


[-- Attachment #3: Type: text/plain, Size: 154 bytes --]


-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar®  http://AvatarAcademy.nl  

Re: [PATCH] gnu: Add tcllib.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 3436 bytes --]

On Tue, 09 Feb 2016 21:19:35 +0100
Jan Nieuwenhuizen <janneke@gnu.org> wrote:

> From: Jan Nieuwenhuizen <janneke@gnu.org>
> To: guix-devel@gnu.org
> Subject: [PATCH] gnu: Add tcllib.
> Date: Tue, 09 Feb 2016 21:19:35 +0100
> Sender: guix-devel-bounces+efraim=flashner.co.il@gnu.org
> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux)
> Organization: AvatarAcademy.nl
> 
> Hi,
> 
> A "new" package.
> 
> Greetings, Jan
> 
> 
> From 51f0b17b38385197240bca37b290730b2fbe5df1 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> Date: Tue, 9 Feb 2016 20:44:59 +0100
> Subject: [PATCH] gnu: Add tcllib.
> 
>     * gnu/packages/tcl.scm (tcllib): New variable.
> ---
>  gnu/packages/tcl.scm | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
> 
> diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
> index 2c4c750..8d6059d 100644
> --- a/gnu/packages/tcl.scm
> +++ b/gnu/packages/tcl.scm
> @@ -3,6 +3,7 @@
>  ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
>  ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
>  ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
> +;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -219,3 +220,33 @@ 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
I don't think this needs to be a list. Also, it should be indented 2 spaces
(I believe)

> +	    (variable "TCLLIBPATH")
> +	    (separator " ")
> +	    (files (list (string-append "lib/tcllib" version ""))))))
why the double quote after 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
utility should be on the next line

> + functions and modules all written in high-level Tcl.
> +")
the ") should be on the previous line

> +    (license (non-copyleft "http://www.tcl.tk/software/tcltk/license.html"
> +			   "Tcl/Tk license"))))
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.

> +
> +
> +
you don't need all these extra spaces


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] gnu: Add tcllib.

[Pjotr Prins]

To all. 

Again, I think we have to be more careful with new committers. All
comments below are in the trivial category (in my opinion).

I appreciate the work reviewers are doing (thank you!), but we should
take care to be nice and welcoming so as not to lose people. I
personally think that the focus on spacing and indentation is way over
the top.  Especially when you realise many packages in the tree are
not up to current standards. Anyone looked at python.scm?

Can we concentrate on functionality first. And when a package is
pretty much up to scratch just do the final editing by the actual
committer?

Ricardo give a great example here, he corrects and tells us. That way
we learn in a nice way. Submitting packages and abiding by all the
rules is not trivial. Not to mention that lint is sometimes broken and
there are many packages in the tree that do *not* abide by current
rules. I go wrong when I copy something already there. It is not that
easy.

We need to find a balance between being nice and being correct.

And don't forget: thank you Jan for the contributions :). Please
continue! We welcome you.

Pj.

On Thu, Feb 11, 2016 at 09:53:47PM +0200, Efraim Flashner wrote:
> On Tue, 09 Feb 2016 21:19:35 +0100
> Jan Nieuwenhuizen <janneke@gnu.org> wrote:
> 
> > From: Jan Nieuwenhuizen <janneke@gnu.org>
> > To: guix-devel@gnu.org
> > Subject: [PATCH] gnu: Add tcllib.
> > Date: Tue, 09 Feb 2016 21:19:35 +0100
> > Sender: guix-devel-bounces+efraim=flashner.co.il@gnu.org
> > User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux)
> > Organization: AvatarAcademy.nl
> > 
> > Hi,
> > 
> > A "new" package.
> > 
> > Greetings, Jan
> > 
> > 
> > From 51f0b17b38385197240bca37b290730b2fbe5df1 Mon Sep 17 00:00:00 2001
> > From: Jan Nieuwenhuizen <janneke@gnu.org>
> > Date: Tue, 9 Feb 2016 20:44:59 +0100
> > Subject: [PATCH] gnu: Add tcllib.
> > 
> >     * gnu/packages/tcl.scm (tcllib): New variable.
> > ---
> >  gnu/packages/tcl.scm | 31 +++++++++++++++++++++++++++++++
> >  1 file changed, 31 insertions(+)
> > 
> > diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
> > index 2c4c750..8d6059d 100644
> > --- a/gnu/packages/tcl.scm
> > +++ b/gnu/packages/tcl.scm
> > @@ -3,6 +3,7 @@
> >  ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
> >  ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
> >  ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
> > +;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
> >  ;;;
> >  ;;; This file is part of GNU Guix.
> >  ;;;
> > @@ -219,3 +220,33 @@ 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
> I don't think this needs to be a list. Also, it should be indented 2 spaces
> (I believe)
> 
> > +	    (variable "TCLLIBPATH")
> > +	    (separator " ")
> > +	    (files (list (string-append "lib/tcllib" version ""))))))
> why the double quote after 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
> utility should be on the next line
> 
> > + functions and modules all written in high-level Tcl.
> > +")
> the ") should be on the previous line
> 
> > +    (license (non-copyleft "http://www.tcl.tk/software/tcltk/license.html"
> > +			   "Tcl/Tk license"))))
> 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.
> 
> > +
> > +
> > +
> you don't need all these extra spaces
> 
> 
> -- 
> Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
> GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted



-- 

Re: [PATCH] gnu: Add tcllib.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1800 bytes --]

On Thu, 11 Feb 2016 21:28:33 +0100
Pjotr Prins <pjotr.public12@thebird.nl> wrote:

> To all. 
> 
> Again, I think we have to be more careful with new committers. All
> comments below are in the trivial category (in my opinion).
> 
> I appreciate the work reviewers are doing (thank you!), but we should
> take care to be nice and welcoming so as not to lose people. I
> personally think that the focus on spacing and indentation is way over
> the top.  Especially when you realise many packages in the tree are
> not up to current standards. Anyone looked at python.scm?
> 
> Can we concentrate on functionality first. And when a package is
> pretty much up to scratch just do the final editing by the actual
> committer?
> 
> Ricardo give a great example here, he corrects and tells us. That way
> we learn in a nice way. Submitting packages and abiding by all the
> rules is not trivial. Not to mention that lint is sometimes broken and
> there are many packages in the tree that do *not* abide by current
> rules. I go wrong when I copy something already there. It is not that
> easy.
> 
> We need to find a balance between being nice and being correct.
> 
> And don't forget: thank you Jan for the contributions :). Please
> continue! We welcome you.
> 
> Pj.
> 
> On Thu, Feb 11, 2016 at 09:53:47PM +0200, Efraim Flashner wrote:
> 

Pjotr- thanks for the reminder :). I know we've been a bit behind on patch
review and I jumped in a bit too much.

Jan- I hope I haven't scared you off or discouraged you. Indeed, thank you
for the patches.


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] gnu: Add tcllib.

[Jan Nieuwenhuizen]

[-- Attachment #1: Type: text/plain, Size: 1449 bytes --]

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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-guix-Add-tcl-tk-license.patch --]
[-- Type: text/x-diff, Size: 1092 bytes --]

From c5dd51d51c8da9862882386749b78d708f3488ae Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-tcl-update-to-use-tcl-tk-license-variable.patch --]
[-- Type: text/x-diff, Size: 804 bytes --]

From 813d5d82cca6f517ab64b818cb4b719610e1dbb7 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
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


[-- Attachment #4: 0003-gnu-Add-tcllib.patch --]
[-- Type: text/x-diff, Size: 2041 bytes --]

From bb713e33f7ec89931ad2a71f4eb7c079619dbb83 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@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 | 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 © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; 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 common
+utility functions and modules all written in high-level Tcl.")
+    (license (non-copyleft "http://www.tcl.tk/software/tcltk/license.html"
+			   "Tcl/Tk license"))))
-- 
2.1.4


[-- Attachment #5: Type: text/plain, Size: 154 bytes --]


-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar®  http://AvatarAcademy.nl  

Re: [PATCH] gnu: Add tcllib.

[Jan Nieuwenhuizen]

Efraim Flashner writes:

> Pjotr- thanks for the reminder :). I know we've been a bit behind on patch
> review and I jumped in a bit too much.
>
> Jan- I hope I haven't scared you off or discouraged you. Indeed, thank you
> for the patches.

Thanks for the headsup!

Greetings, Jan

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar®  http://AvatarAcademy.nl  

Re: [PATCH] gnu: Add tcllib.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 2249 bytes --]

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 ;)

[-- Attachment #2: 0001-licenses-Add-tcl-tk-license.patch --]
[-- Type: text/x-diff, Size: 1204 bytes --]

From 818e27dbdd2a033ccf9221ae428a60e54da3f609 Mon Sep 17 00:00:00 2001
Message-Id: <818e27dbdd2a033ccf9221ae428a60e54da3f609.1455253940.git.leo@famulari.name>
From: Jan Nieuwenhuizen <janneke@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


[-- Attachment #3: 0002-gnu-tcl-Use-tcl-tk-license.patch --]
[-- Type: text/x-diff, Size: 1122 bytes --]

From b335e6bfa708d9843b81c5067916782147619609 Mon Sep 17 00:00:00 2001
Message-Id: <b335e6bfa708d9843b81c5067916782147619609.1455253940.git.leo@famulari.name>
In-Reply-To: <818e27dbdd2a033ccf9221ae428a60e54da3f609.1455253940.git.leo@famulari.name>
References: <818e27dbdd2a033ccf9221ae428a60e54da3f609.1455253940.git.leo@famulari.name>
From: Jan Nieuwenhuizen <janneke@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


[-- Attachment #4: 0003-gnu-Add-tcllib.patch --]
[-- Type: text/x-diff, Size: 2195 bytes --]

From f51c775e4b22cc84666514e1129a6f260dec35b7 Mon Sep 17 00:00:00 2001
Message-Id: <f51c775e4b22cc84666514e1129a6f260dec35b7.1455253940.git.leo@famulari.name>
In-Reply-To: <818e27dbdd2a033ccf9221ae428a60e54da3f609.1455253940.git.leo@famulari.name>
References: <818e27dbdd2a033ccf9221ae428a60e54da3f609.1455253940.git.leo@famulari.name>
From: Jan Nieuwenhuizen <janneke@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 <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@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

Re: [PATCH] gnu: Add tcllib.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

On Fri, Feb 12, 2016 at 12:19:14AM -0500, Leo Famulari wrote:

[...]

> Can you check if it works for you? I don't really know how to test this
> package.

My apologies is that patch series does not apply. I have attached
another.

[-- Attachment #2: 0001-licenses-Add-tcl-tk-license.patch --]
[-- Type: text/x-diff, Size: 1204 bytes --]

From 4f0a408aa2e26be245010951289b07f4db9c3326 Mon Sep 17 00:00:00 2001
Message-Id: <4f0a408aa2e26be245010951289b07f4db9c3326.1455254891.git.leo@famulari.name>
From: Jan Nieuwenhuizen <janneke@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


[-- Attachment #3: 0002-gnu-tcl-Use-tcl-tk-license.patch --]
[-- Type: text/x-diff, Size: 1943 bytes --]

From c46477512ef8a710b3d9df8a8f6fcb6d3f54de71 Mon Sep 17 00:00:00 2001
Message-Id: <c46477512ef8a710b3d9df8a8f6fcb6d3f54de71.1455254891.git.leo@famulari.name>
In-Reply-To: <4f0a408aa2e26be245010951289b07f4db9c3326.1455254891.git.leo@famulari.name>
References: <4f0a408aa2e26be245010951289b07f4db9c3326.1455254891.git.leo@famulari.name>
From: Jan Nieuwenhuizen <janneke@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-system.am        | 1 +
 gnu/packages/tcl.scm | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index a6582cd..6076144 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -707,6 +707,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/tar-d_ino_in_dirent-fix.patch		\
   gnu/packages/patches/tar-skip-unreliable-tests.patch		\
   gnu/packages/patches/tcl-mkindex-deterministic.patch		\
+  gnu/packages/patches/tclxml-3.2-install.patch			\
   gnu/packages/patches/tcsh-fix-autotest.patch			\
   gnu/packages/patches/texi2html-document-encoding.patch	\
   gnu/packages/patches/texi2html-i18n.patch			\
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index 2c4c750..161d79e 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -29,6 +29,7 @@
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (guix licenses))
 
@@ -80,8 +81,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


[-- Attachment #4: 0003-gnu-Add-tcllib.patch --]
[-- Type: text/x-diff, Size: 2195 bytes --]

From d04f25b38e2143d4acc11a4e5720658b285e144c Mon Sep 17 00:00:00 2001
Message-Id: <d04f25b38e2143d4acc11a4e5720658b285e144c.1455254891.git.leo@famulari.name>
In-Reply-To: <4f0a408aa2e26be245010951289b07f4db9c3326.1455254891.git.leo@famulari.name>
References: <4f0a408aa2e26be245010951289b07f4db9c3326.1455254891.git.leo@famulari.name>
From: Jan Nieuwenhuizen <janneke@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 161d79e..1f69c1b 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -219,3 +220,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

Re: [PATCH] gnu: Add tcllib.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> Does anyone object to having a slash in the license variable name? I
> don't know whether or not its "safe" [0].

There’s no problem with that, pretty much anything can be used in Scheme
identifiers.

Ludo’.

Re: [PATCH] gnu: Add tcllib.

[Ludovic Courtès]

Hi!

I agree with Pjotr: we need to pay special attention to the way we
review patches coming from newcomers.  If a first patch triggers loads
of whitespace issues, that can be discouraging.  So I think it’s a good
idea to take extra time to fix trivial things in patches from newcomers
and just let the person know.

It’s also good to reduce delays as much as possible for newcomers (old
timers can wait a bit longer ;-)).

Anyway, thanks Jan for joining, and thanks to everyone who helps with
review!  :-)

Ludo’.

Re: [PATCH] gnu: Add tcllib.

[Jan Nieuwenhuizen]

[-- Attachment #1: Type: text/plain, Size: 509 bytes --]

Leo Famulari writes:

>> Can you check if it works for you? I don't really know how to test this
>> package.
>
> My apologies is that patch series does not apply. I have attached
> another.

Works for me;  however, 0002-gnu-tcl-Use-tcl-tk-license.patch somehow
includes a bit from my tclxml patch (to be resent as soon as this gets
in)

    +  gnu/packages/patches/tclxml-3.2-install.patch

Also, hunk #1 of 0003 failed to apply for me.

We should be getting there, sorry for all the trouble.
Greetings, Jan


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-licenses-Add-tcl-tk-license.patch --]
[-- Type: text/x-diff, Size: 1116 bytes --]

From 749d096b9255013ce7a5dbb34cdfe53a30acd50e Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@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.1.4


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-tcl-Use-tcl-tk-license.patch --]
[-- Type: text/x-diff, Size: 1102 bytes --]

From e22a56edfbec41d40dbea3c298d8178e82a45760 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index 2c4c750..161d79e 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -29,6 +29,7 @@
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (guix licenses))
 
@@ -80,8 +81,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


[-- Attachment #4: 0003-gnu-Add-tcllib.patch --]
[-- Type: text/x-diff, Size: 1988 bytes --]

From 391e1082bb8a99d13ede4dcd6a237cb54b599149 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@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 161d79e..1f69c1b 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -219,3 +220,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.1.4


[-- Attachment #5: Type: text/plain, Size: 153 bytes --]



--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar®  http://AvatarAcademy.nl

Re: [PATCH] gnu: Add tcllib.

[Leo Famulari]

On Fri, Feb 12, 2016 at 05:33:29PM +0100, Jan Nieuwenhuizen wrote:
> Leo Famulari writes:
> 
> >> Can you check if it works for you? I don't really know how to test this
> >> package.
> >
> > My apologies is that patch series does not apply. I have attached
> > another.
> 
> Works for me;  however, 0002-gnu-tcl-Use-tcl-tk-license.patch somehow
> includes a bit from my tclxml patch (to be resent as soon as this gets
> in)
> 
>     +  gnu/packages/patches/tclxml-3.2-install.patch

So I guess I actually *did* stay up too late ;)

> 
> Also, hunk #1 of 0003 failed to apply for me.

This kept happening to me! It's one reason I just made a new patch
series from scratch, after manually addressing this failed hunk (your
copyright line, how strange that it would not apply).

> 
> We should be getting there, sorry for all the trouble.
> Greetings, Jan
> 

> From 749d096b9255013ce7a5dbb34cdfe53a30acd50e Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@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.1.4
> 

> From e22a56edfbec41d40dbea3c298d8178e82a45760 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@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 | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
> index 2c4c750..161d79e 100644
> --- a/gnu/packages/tcl.scm
> +++ b/gnu/packages/tcl.scm
> @@ -29,6 +29,7 @@
>    #:use-module (gnu packages fontutils)
>    #:use-module (gnu packages perl)
>    #:use-module (gnu packages pkg-config)
> +  #:use-module (gnu packages xml)
>    #:use-module (gnu packages xorg)
>    #:use-module (guix licenses))
>  
> @@ -80,8 +81,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
> 

> From 391e1082bb8a99d13ede4dcd6a237cb54b599149 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@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 161d79e..1f69c1b 100644
> --- a/gnu/packages/tcl.scm
> +++ b/gnu/packages/tcl.scm
> @@ -3,6 +3,7 @@
>  ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
>  ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
>  ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
> +;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -219,3 +220,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.1.4
> 

> 
> 
> --
> Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
> Freelance IT http://JoyofSource.com | Avatar®  http://AvatarAcademy.nl

Re: [PATCH] gnu: Add tcllib.

[Leo Famulari]

On Fri, Feb 12, 2016 at 05:23:22PM -0500, Leo Famulari wrote:
> On Fri, Feb 12, 2016 at 05:33:29PM +0100, Jan Nieuwenhuizen wrote:
> > Leo Famulari writes:
> > 
> > >> Can you check if it works for you? I don't really know how to test this
> > >> package.
> > >
> > > My apologies is that patch series does not apply. I have attached
> > > another.
> > 
> > Works for me;  however, 0002-gnu-tcl-Use-tcl-tk-license.patch somehow
> > includes a bit from my tclxml patch (to be resent as soon as this gets
> > in)
> > 
> >     +  gnu/packages/patches/tclxml-3.2-install.patch
> 
> So I guess I actually *did* stay up too late ;)
> 
> > 
> > Also, hunk #1 of 0003 failed to apply for me.
> 
> This kept happening to me! It's one reason I just made a new patch
> series from scratch, after manually addressing this failed hunk (your
> copyright line, how strange that it would not apply).

Okay, as discussed on IRC, I've pushed an updated patch series for you,
starting at d29f64707.
Thanks your contribution!