mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-20 14:47:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: chez-scheme: Update to 9.5.2.

Browse source 
* gnu/packages/chez.scm (chez-scheme): Update to 9.5.2.
[native-inputs]: Add util-linux for UUID support.
[arguments]: Remove patch-broken-documentation phase.
[arguments]: Update configure mechanism to prevent CURLing of submodules.
This commit is contained in:
Brett Gilio 2019-12-24 21:56:40 -06:00
parent a066e289ab
commit cded4ca000
No known key found for this signature in database
GPG key ID: 672243C4A03F0EEE
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/chez.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -31,6 +32,7 @@ (define-module (gnu packages chez)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages linux)
#:use-module (gnu packages netpbm) #:use-module (gnu packages netpbm)
#:use-module (gnu packages tex) #:use-module (gnu packages tex)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -62,7 +64,7 @@ (define stex
(define-public chez-scheme (define-public chez-scheme
(package (package
(name "chez-scheme") (name "chez-scheme")
(version "9.5") (version "9.5.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -70,7 +72,7 @@ (define-public chez-scheme
(url "https://github.com/cisco/ChezScheme.git") (url "https://github.com/cisco/ChezScheme.git")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "132fal5hwiq0bqzvfhjsqr4d11cfdh1670f6286ks29xxj1c04zq")) (base32 "1hagrqdp649n2g0wq2a9gfnz7mjcjakkw7ziplbj3db412bb7kx5"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -92,7 +94,8 @@ (define-public chez-scheme
`(("texlive" ,(texlive-union (list texlive-latex-oberdiek `(("texlive" ,(texlive-union (list texlive-latex-oberdiek
texlive-generic-epsf))) texlive-generic-epsf)))
("ghostscript" ,ghostscript) ("ghostscript" ,ghostscript)
("netpbm" ,netpbm))) ("netpbm" ,netpbm)
("util-linux" ,util-linux)))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "CHEZSCHEMELIBDIRS") (variable "CHEZSCHEMELIBDIRS")
@ -116,15 +119,6 @@ (define-public chez-scheme
(lambda _ (substitute* "configure" (lambda _ (substitute* "configure"
(("uname -a") "uname -m")) (("uname -a") "uname -m"))
#t)) #t))
(add-after 'unpack 'patch-broken-documentation
(lambda _
;; Work around an oversight in the 9.5 release tarball that causes
;; building the documentation to fail. This should be fixed in the
;; next one; see <https://github.com/cisco/ChezScheme/issues/209>.
(substitute* "csug/copyright.stex"
(("\\\\INSERTREVISIONMONTHSPACEYEAR" )
"October 2017")) ; tarball release date
#t))
;; Adapt the custom 'configure' script. ;; Adapt the custom 'configure' script.
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -145,10 +139,11 @@ (define-public chez-scheme
(invoke "mv" orig-name new-name))) (invoke "mv" orig-name new-name)))
`((,nanopass "source" "nanopass") `((,nanopass "source" "nanopass")
(,stex "source" "stex"))) (,stex "source" "stex")))
;; The Makefile wants to download and compile "zlib". We patch ;; The configure step wants to CURL all submodules as it
;; it to use the one from our 'zlib' package. ;; detects a checkout without submodules. Disable curling,
;; and manually patch the needed modules for compilation.
(substitute* "configure" (substitute* "configure"
(("rmdir zlib .*$") "echo \"using system zlib\"\n")) (("! -f '") "-d '")) ; working around CURL.
(substitute* (find-files "./c" "Mf-[a-zA-Z0-9.]+") (substitute* (find-files "./c" "Mf-[a-zA-Z0-9.]+")
(("\\$\\{Kernel\\}: \\$\\{kernelobj\\} \\.\\./zlib/libz\\.a") (("\\$\\{Kernel\\}: \\$\\{kernelobj\\} \\.\\./zlib/libz\\.a")
"${Kernel}: ${kernelobj}") "${Kernel}: ${kernelobj}")