From 6a6db57f843e07f6b37508f0bc1c2d4c919debe0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 12:16:48 +0100 Subject: gnu: Switch from xproto to xorgproto. * gnu/packages/compton.scm (compton)[inputs]: Replace XPROTO with XORGPROTO. * gnu/packages/enlightenment.scm (efl)[inputs]: Likewise. * gnu/packages/gnome.scm (totem)[inputs]: Likewise. * gnu/packages/haskell.scm (ghc-x11-xft)[inputs]: Likewise. * gnu/packages/image-processing.scm (vtk)[inputs]: Likewise. * gnu/packages/mate.scm (mate-control-center, mate-netbook, mate-screensaver, mate-utils)[native-inputs]: Likewise. * gnu/packages/xdisorg.scm (xautomation)[native-inputs]: Likewise. * gnu/packages/xnee.scm (xnee)[inputs]: Likewise. * gnu/packages/xorg.scm (imake, lndir, libxshmfence, libfontenc, libfs, libxcomposite, libxdmcp, libxft, libxmu, libxpm, libxres, makedepend, mkfontscale, sessreg, xev, xf86-video-qxl, xkbcomp-intermediate, xkbutils, xlsfonts, xmodmap, xpr, xprop, xrandr, xset, xwd, xwininfo, xwud, xorg-rgb, libxdamage, libxrender, libxv, libice, libxau, libxfixes, libxfont, libxi, libxrandr, libxvmc, xorg-server, libxcursor, libxaw, twm, xinit, xterm)[inputs]: Likewise. (xorgproto): Move expression before all other -proto packages. (xproto)[properties]: Mark as superseded by XORGPROTO. --- gnu/packages/tcl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/tcl.scm') diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 8988cdc3b1..64b78e29b2 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -100,7 +100,7 @@ (inputs `(;; TODO: Add these optional dependencies. ;; ("libX11" ,libX11) - ;; ("xproto" ,xproto) + ;; ("xorgproto" ,xorgproto) ;; ("tk" ,tk) ("tcl" ,tcl))) (arguments -- cgit 1.4.1 From eed6985fc671e7a6410f5a44a717cd7d386e435a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 17 Mar 2018 20:33:01 -0400 Subject: gnu: tk: Return #t from all phases. * gnu/packages/tcl.scm (tk)[arguments]: Return #t from 'pre-configure' phase. --- gnu/packages/tcl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/tcl.scm') diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 64b78e29b2..19b2bbf389 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -150,7 +150,8 @@ X11 GUIs.") (add-before 'configure 'pre-configure (lambda _ - (chdir "unix"))) + (chdir "unix") + #t)) (add-after 'install 'add-fontconfig-flag (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit 1.4.1 From 6fea8adec913f29e20acc50b6e2f24341790ce50 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 23 Mar 2018 03:51:50 -0400 Subject: gnu: tcl: Use invoke. * gnu/packages/tcl.scm (tcl)[arguments]: Use invoke and remove vestigial plumbing in the 'install-private-headers' phase. --- gnu/packages/tcl.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'gnu/packages/tcl.scm') diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 19b2bbf389..ef78e57cd7 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès -;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen @@ -55,16 +55,15 @@ (add-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")) - #t))))) + (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 -- cgit 1.4.1 From 61565a5f4aed8a0205acfb7219273b71a9d2fd3b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 29 Mar 2018 02:56:23 +0200 Subject: gnu: tcl, tk: Update to 8.6.8. * gnu/packages/tcl.scm (tcl, tk): Update to 8.6.8. --- gnu/packages/tcl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/tcl.scm') diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index ef78e57cd7..97e1427bec 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -39,14 +39,14 @@ (define-public tcl (package (name "tcl") - (version "8.6.7") + (version "8.6.8") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/tcl/Tcl/" version "/tcl" version "-src.tar.gz")) (sha256 (base32 - "19bb09l55alz4jb38961ikd5116q80s51bjvzqy44ckkwf28ysvw")))) + "0sprsg7wnraa4cbwgbcliylm6p0rspfymxn8ww02pr4ca70v0g64")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -134,14 +134,14 @@ X11 GUIs.") (define-public tk (package (name "tk") - (version "8.6.7") + (version "8.6.8") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/tcl/Tcl/" version "/tk" version "-src.tar.gz")) (sha256 (base32 - "1aipcf6qmbgi15av8yrpp2hx6vdwr684r6739p8cgdzrajiy4786")) + "0cvvznjwfn0i9vj9cw3wg8svx25ha34gg57m4xd1k5fyinhbrrs9")) (patches (search-patches "tk-find-library.patch")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1