diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:36:11 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:48:37 -0500 |
| commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
| tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /gnu/packages/tcl.scm | |
| parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
| download | guix-0d41fe4855588fb659b8adafe215d5573517a79b.tar.gz guix-0d41fe4855588fb659b8adafe215d5573517a79b.zip | |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'gnu/packages/tcl.scm')
| -rw-r--r-- | gnu/packages/tcl.scm | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index f05642a3f9..810095282e 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -5,7 +5,7 @@ ;;; 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> +;;; Copyright © 2018, 2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; @@ -25,6 +25,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages tcl) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -96,7 +97,7 @@ (define-public itcl (package (name "itcl") - (version "4.2.0") + (version "4.2.2") (source (origin (method url-fetch) @@ -105,33 +106,29 @@ version "/itcl" version ".tar.gz")) (file-name (string-append "incrtcl-" version ".tar.gz")) (sha256 - (base32 "0w28v0zaraxcq1s9pa6cihqqwqvvwfgz275lks7w4gl7hxjxmasw")))) + (base32 "0v0m1s3rlsbg7p366i6m5zcvnmixnch87jmczidjanqvmw76fk5c")))) (build-system gnu-build-system) (arguments - `(#:configure-flags - (list - (string-append - "--exec-prefix=" (assoc-ref %outputs "out")) - (string-append - "--with-tclinclude=" (assoc-ref %build-inputs "tcl") "/include") - (string-append - "--with-tcl=" (assoc-ref %build-inputs "tcl") "/lib")) - #:test-target "test" - #:phases - (modify-phases %standard-phases - (add-after 'install 'cleanup-bin-and-lib - (lambda* (#:key outputs #:allow-other-keys) - ;; NOTE: (Sharlatan-20210213T204336+0000): libraries appearer in - ;; "out/lib/itcl{{version}}" and there are no binaries, some extra - ;; rename and remove spells are to be applied. - (let ((out (assoc-ref outputs "out"))) - (rmdir - (string-append out "/bin")) - (rename-file - (string-append out "/lib/itcl" ,version) (string-append out "/libtmp")) - (rename-file - (string-append out "/libtmp") (string-append out "/lib"))) - #t))))) + (list #:configure-flags + #~(list + (string-append "--exec-prefix=" #$output) + (string-append "--with-tclinclude=" + (assoc-ref %build-inputs "tcl") "/include") + (string-append "--with-tcl=" + (assoc-ref %build-inputs "tcl") "/lib")) + #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'clean-up-bin-and-lib + (lambda _ + ;; NOTE: (Sharlatan-20210213T204336+0000): libraries appearer in + ;; "out/lib/itcl{{version}}" and there are no binaries, some extra + ;; rename and remove spells are to be applied. + (rmdir (string-append #$output "/bin")) + (rename-file (string-append #$output "/lib/itcl" #$version) + (string-append #$output "/libtmp")) + (rename-file (string-append #$output "/libtmp") + (string-append #$output "/lib"))))))) (native-inputs (list tcl)) (inputs |