aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/tcl.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-06-27 23:33:48 +0200
committerLudovic Courtès <ludo@gnu.org>2019-06-27 23:33:48 +0200
commit5cc1075a76392666d3d733837f5c6252b1e48002 (patch)
treeaff2a303881a6fe53021a6e78a767958e608719b /gnu/packages/tcl.scm
parent9c2563a80b6f1d8fb8677f5314e6180ea9916aa5 (diff)
parentc30d117822a8ca26cd8c06c0a3974955bef68eac (diff)
downloadguix-5cc1075a76392666d3d733837f5c6252b1e48002.tar
guix-5cc1075a76392666d3d733837f5c6252b1e48002.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/tcl.scm')
-rw-r--r--gnu/packages/tcl.scm42
1 files changed, 36 insertions, 6 deletions
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index 69313b9bb6..21ca185066 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -25,8 +26,10 @@
(define-module (gnu packages tcl)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system go)
#:use-module (guix build-system perl)
#:use-module (gnu packages)
#:use-module (gnu packages image)
@@ -35,7 +38,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
- #:use-module (guix licenses))
+ #:use-module ((guix licenses) #:prefix license:))
(define-public tcl
(package
@@ -81,7 +84,7 @@
(home-page "http://www.tcl.tk/")
(synopsis "The Tcl scripting language")
(description "The Tcl (Tool Command Language) scripting language.")
- (license tcl/tk)))
+ (license license:tcl/tk)))
(define-public expect
@@ -130,7 +133,7 @@ telnet, ftp, passwd, fsck, rlogin, tip, etc. Expect really makes this
stuff trivial. Expect is also useful for testing these same
applications. And by adding Tk, you can wrap interactive applications in
X11 GUIs.")
- (license public-domain))) ; as written in `license.terms'
+ (license license:public-domain))) ; as written in `license.terms'
(define-public tk
(package
@@ -230,7 +233,7 @@ interfaces (GUIs) in the Tcl language.")
;; those of the orignal Tix4.1.3 or Tk8.4.* sources. See the files
;; pTk/license.terms, pTk/license.html_lib, and pTk/Tix.license for
;; details of this license."
- (license perl-license)))
+ (license license:perl-license)))
(define-public tcllib
(package
@@ -344,7 +347,7 @@ modules for Tk, all written in high-level Tcl. Examples of provided widgets:
application may register callback scripts for certain document features, and
when the parser encounters those features while parsing the document the
callback is evaluated.")
- (license (non-copyleft
+ (license (license:non-copyleft
"file://LICENCE"
"See LICENCE in the distribution."))))
@@ -378,4 +381,31 @@ callback is evaluated.")
application development. TclX provides additional interfaces to the operating
system, and adds many new programming constructs, text manipulation tools, and
debugging tools.")
- (license tcl/tk)))
+ (license license:tcl/tk)))
+
+(define-public go-github.com-nsf-gothic
+ (let ((commit "97dfcc195b9de36c911a69a6ec2b5b2659c05652")
+ (revision "0"))
+ (package
+ (name "go-github.com-nsf-gothic")
+ (version (git-version "0.0.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nsf/gothic")
+ (commit commit)))
+ (sha256
+ (base32
+ "1lrhbml6r4sh22rrn3m9bck70pv0g0c1diprg7cil90x0jidxczr"))
+ (file-name (git-file-name name version))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "github.com/nsf/gothic"))
+ (propagated-inputs
+ `(("tk" ,tk)
+ ("tcl" ,tcl)))
+ (home-page "https://github.com/nsf/gothic")
+ (synopsis "Tcl/Tk Go bindings")
+ (description "Gothic contains Go bindings for Tcl/Tk. The package contains
+only one type and one function that can be used to create a Tk interpreter.")
+ (license license:expat))))