From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: Re: [PATCH] gnu: Add tcllib. Date: Fri, 12 Feb 2016 17:33:29 +0100 Message-ID: <878u2pdh2e.fsf@gnu.org> References: <87vb5xeiw8.fsf@gnu.org> <20160211215347.0aac83dd@debian-netbook> <87wpqbc5qs.fsf@gnu.org> <20160212051914.GA32278@jasmine> <20160212052937.GA2856@jasmine> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUGf4-00067T-Gb for guix-devel@gnu.org; Fri, 12 Feb 2016 11:33:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aUGf0-0004iR-Cr for guix-devel@gnu.org; Fri, 12 Feb 2016 11:33:38 -0500 Received: from lb3-smtp-cloud2.xs4all.net ([194.109.24.29]:52259) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUGez-0004gl-UY for guix-devel@gnu.org; Fri, 12 Feb 2016 11:33:34 -0500 In-Reply-To: <20160212052937.GA2856@jasmine> (Leo Famulari's message of "Fri, 12 Feb 2016 00:29:37 -0500") 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: Leo Famulari Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-licenses-Add-tcl-tk-license.patch >From 749d096b9255013ce7a5dbb34cdfe53a30acd50e Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen 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 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-tcl-Use-tcl-tk-license.patch >From e22a56edfbec41d40dbea3c298d8178e82a45760 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: 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 --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0003-gnu-Add-tcllib.patch Content-Transfer-Encoding: quoted-printable >From 391e1082bb8a99d13ede4dcd6a237cb54b599149 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 | 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 =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. ;;; @@ -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 com= mon +utility functions and modules all written in high-level Tcl.") + (license (package-license tcl)))) --=20 2.1.4 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.nl --=-=-=--