From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH] gnu: Add tcllib. Date: Fri, 12 Feb 2016 00:29:37 -0500 Message-ID: <20160212052937.GA2856@jasmine> References: <87vb5xeiw8.fsf@gnu.org> <20160211215347.0aac83dd@debian-netbook> <87wpqbc5qs.fsf@gnu.org> <20160212051914.GA32278@jasmine> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="d6Gm4EdcadzBjdND" Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aU6IU-0000Yn-Ee for guix-devel@gnu.org; Fri, 12 Feb 2016 00:29:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aU6IR-0006Pc-RQ for guix-devel@gnu.org; Fri, 12 Feb 2016 00:29:38 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:50926) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aU6IR-0006PG-OI for guix-devel@gnu.org; Fri, 12 Feb 2016 00:29:35 -0500 Content-Disposition: inline In-Reply-To: <20160212051914.GA32278@jasmine> 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: Jan Nieuwenhuizen Cc: guix-devel@gnu.org --d6Gm4EdcadzBjdND Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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. --d6Gm4EdcadzBjdND Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-licenses-Add-tcl-tk-license.patch" >From 4f0a408aa2e26be245010951289b07f4db9c3326 Mon Sep 17 00:00:00 2001 Message-Id: <4f0a408aa2e26be245010951289b07f4db9c3326.1455254891.git.leo@famulari.name> 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.6.3 --d6Gm4EdcadzBjdND Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0002-gnu-tcl-Use-tcl-tk-license.patch" >From c46477512ef8a710b3d9df8a8f6fcb6d3f54de71 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: <4f0a408aa2e26be245010951289b07f4db9c3326.1455254891.git.leo@famulari.name> References: <4f0a408aa2e26be245010951289b07f4db9c3326.1455254891.git.leo@famulari.name> 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-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 --d6Gm4EdcadzBjdND Content-Type: text/x-diff; charset=iso-8859-1 Content-Disposition: attachment; filename="0003-gnu-Add-tcllib.patch" Content-Transfer-Encoding: 8bit >From d04f25b38e2143d4acc11a4e5720658b285e144c Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: <4f0a408aa2e26be245010951289b07f4db9c3326.1455254891.git.leo@famulari.name> References: <4f0a408aa2e26be245010951289b07f4db9c3326.1455254891.git.leo@famulari.name> 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 © 2014, 2015 Mark H Weaver ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 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 common +utility functions and modules all written in high-level Tcl.") + (license (package-license tcl)))) -- 2.6.3 --d6Gm4EdcadzBjdND--