;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
(define-module (gnu packages tcl)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
#:use-module (gnu packages)
(define-public tcl
(package
(name "tcl")
- (version "8.6.6")
+ (version "8.6.8")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/tcl/Tcl/"
version "/tcl" version "-src.tar.gz"))
(sha256
(base32
- "01zypqhy57wvh1ikk28bg733sk5kf4q568pq9v6fvcz4h6bl0rd2"))
- (patches (search-patches "tcl-mkindex-deterministic.patch"))))
+ "0sprsg7wnraa4cbwgbcliylm6p0rspfymxn8ww02pr4ca70v0g64"))))
(build-system gnu-build-system)
(arguments
- '(#:phases (alist-cons-before
- 'configure 'pre-configure
- (lambda _
- (chdir "unix"))
- (alist-cons-after
- 'install 'install-private-headers
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Private headers are needed by Expect.
- (and (zero? (system* "make"
- "install-private-headers"))
- (let ((bin (string-append (assoc-ref outputs "out")
- "/bin")))
- ;; Create a tclsh -> tclsh8.6 symlink.
- ;; Programs such as Ghostscript rely on it.
- (with-directory-excursion bin
- (symlink (car (find-files "." "tclsh"))
- "tclsh")))))
- %standard-phases))
+ '(#:phases (modify-phases %standard-phases
+ (add-before 'configure 'pre-configure
+ (lambda _ (chdir "unix") #t))
+ (add-after 'install 'install-private-headers
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Private headers are needed by Expect.
+ (invoke "make" "install-private-headers")
+ (let ((bin (string-append (assoc-ref outputs "out")
+ "/bin")))
+ ;; Create a tclsh -> tclsh8.6 symlink.
+ ;; Programs such as Ghostscript rely on it.
+ (with-directory-excursion bin
+ (symlink (car (find-files "." "tclsh"))
+ "tclsh"))
+ #t))))
;; By default, man pages are put in PREFIX/man, but we want them in
;; PREFIX/share/man. The 'validate-documentation-location' phase is
(define-public expect
(package
(name "expect")
- (version "5.45")
+ (version "5.45.4")
(source
(origin
(method url-fetch)
version "/expect" version ".tar.gz"))
(sha256
(base32
- "0h60bifxj876afz4im35rmnbnxjx4lbdqp2ja3k30fwa8a8cm3dj"))))
+ "0d1cp5hggjl93xwc8h1y6adbnrvpkk0ywkd00inz9ndxn21xm9s9"))))
(build-system gnu-build-system)
(inputs
`(;; TODO: Add these optional dependencies.
;; ("libX11" ,libX11)
- ;; ("xproto" ,xproto)
+ ;; ("xorgproto" ,xorgproto)
;; ("tk" ,tk)
("tcl" ,tcl)))
(arguments
(string-append "--exec-prefix=" out)
(string-append "--mandir=" out "/share/man")))
- #:phases (alist-cons-before
- 'configure 'set-path-to-stty
- (lambda _
- (substitute* "configure"
- (("STTY_BIN=/bin/stty")
- (string-append "STTY_BIN=" (which "stty")))))
- %standard-phases)
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'set-path-to-stty
+ (lambda _
+ (substitute* "configure"
+ (("STTY_BIN=/bin/stty")
+ (string-append "STTY_BIN=" (which "stty"))))
+ #t)))
#:test-target "test"))
- (home-page "http://expect.nist.gov/")
+ (home-page "http://expect.sourceforge.net/")
(synopsis "Tool for automating interactive applications")
(description
"Expect is a tool for automating interactive applications such as
(define-public tk
(package
(name "tk")
- (version "8.6.6")
+ (version "8.6.8")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/tcl/Tcl/"
version "/tk" version "-src.tar.gz"))
(sha256
(base32
- "17diivcfcwdhp4v5zi6j9nkxncccjqkivhp363c4wx5lf4d3fb6n"))
+ "0cvvznjwfn0i9vj9cw3wg8svx25ha34gg57m4xd1k5fyinhbrrs9"))
(patches (search-patches "tk-find-library.patch"))))
(build-system gnu-build-system)
(arguments
- '(#:phases (modify-phases %standard-phases
+ `(#:phases (modify-phases %standard-phases
(add-before
'configure 'pre-configure
(lambda _
- (chdir "unix")))
+ (chdir "unix")
+ #t))
+ (add-after
+ 'install 'create-wish-symlink
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (symlink (string-append out "/bin/wish"
+ ,(version-major+minor
+ (package-version tk)))
+ (string-append out "/bin/wish")))
+ #t))
(add-after
'install 'add-fontconfig-flag
(lambda* (#:key inputs outputs #:allow-other-keys)
(propagated-inputs `(("libx11" ,libx11)
("libxext" ,libxext)))
- (home-page "http://www.tcl.tk/")
+ (home-page "https://www.tcl.tk/")
(synopsis "Graphical user interface toolkit for Tcl")
(description
"Tk is a graphical toolkit for building graphical user
(synopsis "Graphical user interface toolkit for Perl")
(description
"Tk is a Graphical User Interface ToolKit.")
- (home-page (string-append "http://search.cpan.org/~srezic/Tk-" version))
+ (home-page "https://metacpan.org/release/Tk")
;; From the package README: "... you can redistribute it and/or modify it
;; under the same terms as Perl itself, with the exception of all the
;; files in the pTk sub-directory which have separate terms derived from
@enumerate
@item @code{chatwidget}
@item @code{datefield}
-@item @code{tooltip
+@item @code{tooltip}
@item @code{cursor}
@item @code{ipentry}
@item @code{tablelist}
@item @code{ctext}
@item @code{autosscroll}
@item @code{canvas}
-#end enumerate")
+@end enumerate")
(license (package-license tcl))))
(define-public tclxml
(build-system gnu-build-system)
(native-inputs
`(("tcl" ,tcl)
- ("tcllib" ,tcllib)
("libxml2" ,libxml2)
("libxslt" ,libxslt)))
+ (propagated-inputs
+ `(("tcllib" ,tcllib))) ; uri
(native-search-paths
(list (search-path-specification
(variable "TCLLIBPATH")