From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikita Karetnikov Subject: [PATCH] gnu: tcl: Avoid a circular dependency. Date: Wed, 05 Jun 2013 16:49:09 +0400 Message-ID: <87r4ggd8oq.fsf@karetnikov.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkD6G-0001gz-DO for bug-guix@gnu.org; Wed, 05 Jun 2013 08:46:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkD6C-00058T-Ry for bug-guix@gnu.org; Wed, 05 Jun 2013 08:46:00 -0400 Received: from [2a01:7e00::f03c:91ff:fedf:181] (port=36602 helo=cooksoni.karetnikov.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkD6C-00058D-Iy for bug-guix@gnu.org; Wed, 05 Jun 2013 08:45:56 -0400 List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org To: bug-guix@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= You'll get the following error if you run 'git pull && make clean && make'. Feel free to push if the patch is OK. Backtrace: In ice-9/boot-9.scm: 3001: 19 [#] In unknown file: ?: 18 [primitive-load-path "gnu/packages/ghostscript" ...] In gnu/packages/ghostscript.scm: 19: 17 [#] In ice-9/boot-9.scm: 2870: 16 [define-module* (gnu packages ghostscript) #:filename ...] 2845: 15 [resolve-imports ((#) (#) (#) (#) ...)] 2783: 14 [resolve-interface (gnu packages tcl) #:select ...] 2708: 13 [# # ...] 2981: 12 [try-module-autoload (gnu packages tcl) #f] 2320: 11 [save-module-excursion #] 3001: 10 [#] In unknown file: ?: 9 [primitive-load-path "gnu/packages/tcl" ...] In ice-9/eval.scm: 432: 8 [eval # ()] 453: 7 [eval # ()] 432: 6 [eval # #] 436: 5 [eval # #] 387: 4 [eval # #] 387: 3 [eval # #] 393: 2 [eval # (# # # ...)] In unknown file: ?: 1 [memoize-variable-access! # #] In ice-9/boot-9.scm: 106: 0 [# unbound-variable ...] ice-9/boot-9.scm:106:20: In procedure #: ice-9/boot-9.scm:106:20: Unbound variable: libx11 make[2]: *** [gnu/packages/cflow.go] Error 1 make[2]: Leaving directory `/home/guix' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/guix' make: *** [all] Error 2 --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-tcl-Avoid-a-circular-dependency.patch Content-Transfer-Encoding: quoted-printable From=205c55c8ec6951864b46f9436f87ae31ff16fe825d Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Wed, 5 Jun 2013 11:54:19 +0000 Subject: [PATCH] gnu: tcl: Avoid a circular dependency. * gnu/packages/tcl.scm: Remove 'tk'. * gnu/packages/tk.scm: Move 'tk' to this file. * gnu/packages/wordnet.scm: Import (gnu packages tk). * Makefile.am (MODULES): Add 'gnu/packages/tk.scm'. =2D-- Makefile.am | 1 + gnu/packages/tcl.scm | 38 --------------------------- gnu/packages/tk.scm | 63 ++++++++++++++++++++++++++++++++++++++++++= ++++ gnu/packages/wordnet.scm | 3 +- 4 files changed, 66 insertions(+), 39 deletions(-) create mode 100644 gnu/packages/tk.scm diff --git a/Makefile.am b/Makefile.am index 9f106a2..8da4c46 100644 =2D-- a/Makefile.am +++ b/Makefile.am @@ -192,6 +192,7 @@ MODULES =3D \ gnu/packages/texinfo.scm \ gnu/packages/texlive.scm \ gnu/packages/time.scm \ + gnu/packages/tk.scm \ gnu/packages/tmux.scm \ gnu/packages/tor.scm \ gnu/packages/unrtf.scm \ diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index d025bff..3324d7b 100644 =2D-- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -20,7 +20,6 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) =2D #:use-module (gnu packages xorg) #:use-module (guix licenses)) =20 (define-public tcl @@ -117,40 +116,3 @@ applications. And by adding Tk, you can wrap interacti= ve applications in X11 GUIs.") (license public-domain))) ; as written in `license.terms' =20 =2D(define-public tk =2D (package =2D (name "tk") =2D (version "8.6.0") =2D (source (origin =2D (method url-fetch) =2D (uri (string-append "mirror://sourceforge/tcl/Tcl/" =2D version "/tk" version "-src.tar.gz")) =2D (sha256 =2D (base32 =2D "1rld0l7p1h31z488w44j170jpsm11xsjf2qrb7gid2b5dwmqnw2w")))) =2D (build-system gnu-build-system) =2D (arguments =2D '(#:phases (alist-cons-before =2D 'configure 'pre-configure =2D (lambda _ =2D (chdir "unix")) =2D %standard-phases) =2D =2D #:configure-flags (list (string-append "--with-tcl=3D" =2D (assoc-ref %build-inputs "= tcl") =2D "/lib")) =2D =2D ;; The tests require a running X server, so we just skip them. =2D #:tests? #f)) =2D (inputs `(("tcl" ,tcl))) =2D =2D ;; tk.h refers to X11 headers, hence the propagation. =2D (propagated-inputs `(("libx11" ,libx11) =2D ("libxext" ,libxext))) =2D =2D (home-page "http://www.tcl.tk/") =2D (synopsis "Graphical user interface toolkit for Tcl") =2D (description =2D "Tk is a graphical toolkit for building graphical user interfaces =2D(GUIs) in the Tcl language.") =2D (license (package-license tcl)))) diff --git a/gnu/packages/tk.scm b/gnu/packages/tk.scm new file mode 100644 index 0000000..446e2cb =2D-- /dev/null +++ b/gnu/packages/tk.scm @@ -0,0 +1,63 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2013 Ludovic Court=C3=A8s +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages tk) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages tcl) + #:use-module (gnu packages xorg) + #:use-module (guix licenses)) + +(define-public tk + (package + (name "tk") + (version "8.6.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/tcl/Tcl/" + version "/tk" version "-src.tar.gz")) + (sha256 + (base32 + "1rld0l7p1h31z488w44j170jpsm11xsjf2qrb7gid2b5dwmqnw2w")))) + (build-system gnu-build-system) + (arguments + '(#:phases (alist-cons-before + 'configure 'pre-configure + (lambda _ + (chdir "unix")) + %standard-phases) + + #:configure-flags (list (string-append "--with-tcl=3D" + (assoc-ref %build-inputs "tc= l") + "/lib")) + + ;; The tests require a running X server, so we just skip them. + #:tests? #f)) + (inputs `(("tcl" ,tcl))) + + ;; tk.h refers to X11 headers, hence the propagation. + (propagated-inputs `(("libx11" ,libx11) + ("libxext" ,libxext))) + + (home-page "http://www.tcl.tk/") + (synopsis "Graphical user interface toolkit for Tcl") + (description + "Tk is a graphical toolkit for building graphical user interfaces +(GUIs) in the Tcl language.") + (license (package-license tcl)))) \ No newline at end of file diff --git a/gnu/packages/wordnet.scm b/gnu/packages/wordnet.scm index cb385d4..151ad67 100644 =2D-- a/gnu/packages/wordnet.scm +++ b/gnu/packages/wordnet.scm @@ -21,7 +21,8 @@ #:use-module (guix build-system gnu) #:use-module (guix licenses) #:use-module (guix download) =2D #:use-module (gnu packages tcl)) + #:use-module (gnu packages tcl) + #:use-module (gnu packages tk)) =20 (define-public wordnet (package =2D-=20 1.7.5.4 --=-=-=-- --==-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAEBAgAGBQJRrzPIAAoJEM+IQzI9IQ389qcP/3vsKQI9hS8t6AZzPvn9Y+3q Q0q9EnH1lNEoQ7Lv+tk8hxVkNwxoAixyF9J/tIGZGHuJn/m8o0KXsi99lNpfs2FY +n7ZBQilPg+WZuObDREFZUF+zAfKAx3QrzlYIJWHfgbTGVdYZm9e5ntrwvGtOcue OvpKEAT/Ug/gb0s1NRK77/MkhOJIN/5eaNfVoBLAkj6gcDvKUbc4Sm+n0FAHhoax Nlrr7y49qHxZYonfMb533K25tW1bM1JqgEWBAhLkVWaKjek1gO25g6HJJSnO3fF9 h92mGD9YYibiihvzh2/PwIDCMyGga9Wp/aDFA0gJfYvBkLMwavhZzGzUB8mVIYEK xMkPkBM4KJYlLwZhSbxOBWuW6dxZXuQRT7Yx5Ou4WTuDJtnoU1GZoxV2sbA9lwY1 ZwhqM2o1ybmeeYHktCHJI/YsBH++IGtbfcuLEmh5faW0BOT8dtbjKsciQwKq7CnN fizU79T++ZbRXPXL0kWP32HX2QahsaMl+TGkcPDM4VfzG9bswfmDE6RrvXga1SJX vj6yA1qGaYFddB0nSCUnSrflYNVWKoOvLOyHS7GGw4Yh5oVZ7rBkVuHSIRyHFy2B qgTq9g9oyjDoiaBPTE/LYgQ1haFpGoZSbO6eOLNoDjQnEONuZ/eWdwOH3q8EcOaJ BiSe50ECBxXnnqJVIOHp =DMu2 -----END PGP SIGNATURE----- --==-=-=--