nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: scmutils: Update to 20160827. 

* gnu/packages/scheme.scm (scmutils): Update to 20160827.
[arguments]: Fix indentation.
This commit is contained in:
Kei Kebreau 2017-12-24 13:59:38 -05:00
parent b982fb1c09
commit 595b175103
No known key found for this signature in database
GPG Key ID: E6A5EE3C19467A0D
1 changed files with 94 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
gnu/packages/scheme.scm
View File

@ -599,7 +599,7 @@ threads.")
(package (package
(name "scmutils") (name "scmutils")
(version "20140302") (version "20160827")
(source (source
(origin (origin
(method url-fetch/tarbomb) (method url-fetch/tarbomb)
@ -611,7 +611,7 @@ threads.")
"/scmutils-tarballs/" name "-" version "/scmutils-tarballs/" name "-" version
"-x86-64-gnu-linux.tar.gz")) "-x86-64-gnu-linux.tar.gz"))
(sha256 (sha256
(base32 "10cnbm7nh78m5mrl1di85s29gny81jb1am9zd9f9yx725xb6dnfg")))) (base32 "00ly5m0s4dy5kxravjaqlpii5zcnr6b9nqm0607lr7xcs52i4j8b"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("mit-scheme" ,mit-scheme) `(("mit-scheme" ,mit-scheme)
@ -626,104 +626,104 @@ threads.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
;; No standard build procedure is used. We set the correct ;; No standard build procedure is used. We set the correct
;; runtime path in the custom build system. ;; runtime path in the custom build system.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
;; Required to find .bci files at runtime. ;; Required to find .bci files at runtime.
(with-directory-excursion "scmutils" (with-directory-excursion "scmutils"
(rename-file "src" "scmutils")) (rename-file "src" "scmutils"))
(substitute* "scmutils/scmutils/load.scm" (substitute* "scmutils/scmutils/load.scm"
(("/usr/local/scmutils/") (("/usr/local/scmutils/")
(string-append out "/lib/mit-scheme-" (string-append out "/lib/mit-scheme-"
,(system-suffix) "/"))) ,(system-suffix) "/")))
#t))) #t)))
(replace 'build (replace 'build
;; Compile the code and build a band. ;; Compile the code and build a band.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(make-img (string-append (make-img (string-append
"echo '(load \"load\") " "echo '(load \"load\") "
"(disk-save \"edwin-mechanics.com\")'" "(disk-save \"edwin-mechanics.com\")'"
"| mit-scheme"))) "| mit-scheme")))
(with-directory-excursion "scmutils/scmutils" (with-directory-excursion "scmutils/scmutils"
(and (zero? (system "mit-scheme < compile.scm")) (and (zero? (system "mit-scheme < compile.scm"))
(zero? (system make-img))))))) (zero? (system make-img)))))))
(add-before 'install 'fix-directory-names (add-before 'install 'fix-directory-names
;; Correct directory names in the startup script. ;; Correct directory names in the startup script.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(scm-root (assoc-ref inputs "mit-scheme"))) (scm-root (assoc-ref inputs "mit-scheme")))
(substitute* "bin/mechanics" (substitute* "bin/mechanics"
(("ROOT=\"\\$\\{SCMUTILS_ROOT:-/.*\\}\"") (("ROOT=\"\\$\\{SCMUTILS_ROOT:-/.*\\}\"")
(string-append (string-append
"ROOT=\"${SCMUTILS_ROOT:-" scm-root "}\"\n" "ROOT=\"${SCMUTILS_ROOT:-" scm-root "}\"\n"
"LIB=\"${ROOT}/lib/mit-scheme-" "LIB=\"${ROOT}/lib/mit-scheme-"
,(system-suffix) ":" ,(system-suffix) ":"
out "/lib/mit-scheme-" ,(system-suffix) "\"")) out "/lib/mit-scheme-" ,(system-suffix) "\""))
(("EDWIN_INFO_DIRECTORY=.*\n") "") (("EDWIN_INFO_DIRECTORY=.*\n") "")
(("SCHEME=.*\n") (("SCHEME=.*\n")
(string-append "SCHEME=\"${ROOT}/bin/scheme " (string-append "SCHEME=\"${ROOT}/bin/scheme "
"--library ${LIB}\"\n")) "--library ${LIB}\"\n"))
(("export EDWIN_INFO_DIRECTORY") "")) (("export EDWIN_INFO_DIRECTORY") ""))
#t))) #t)))
(add-before 'install 'emacs-tags (add-before 'install 'emacs-tags
;; Generate Emacs's tags for easy reference to source ;; Generate Emacs's tags for easy reference to source
;; code. ;; code.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(with-directory-excursion "scmutils/scmutils" (with-directory-excursion "scmutils/scmutils"
(zero? (apply system* "etags" (zero? (apply system* "etags"
(find-files "." "\\.scm")))))) (find-files "." "\\.scm"))))))
(replace 'install (replace 'install
;; Copy files to the store. ;; Copy files to the store.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(define* (copy-files-to-directory files dir (define* (copy-files-to-directory files dir
#:optional (delete? #f)) #:optional (delete? #f))
(for-each (lambda (f) (for-each (lambda (f)
(copy-file f (string-append dir "/" f)) (copy-file f (string-append dir "/" f))
(when delete? (delete-file f))) (when delete? (delete-file f)))
files)) files))
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(doc (string-append out "/share/doc/" (doc (string-append out "/share/doc/"
,name "-" ,version)) ,name "-" ,version))
(lib (string-append out "/lib/mit-scheme-" (lib (string-append out "/lib/mit-scheme-"
,(system-suffix) ,(system-suffix)
"/scmutils"))) "/scmutils")))
(for-each mkdir-p (list lib doc bin)) (for-each mkdir-p (list lib doc bin))
(with-directory-excursion "scmutils/scmutils" (with-directory-excursion "scmutils/scmutils"
(copy-files-to-directory '("COPYING" "LICENSE") (copy-files-to-directory '("COPYING" "LICENSE")
doc #t) doc #t)
(for-each delete-file (find-files "." "\\.bin")) (for-each delete-file (find-files "." "\\.bin"))
(copy-files-to-directory '("edwin-mechanics.com") (copy-files-to-directory '("edwin-mechanics.com")
(string-append lib "/..") #t) (string-append lib "/..") #t)
(copy-recursively "." lib)) (copy-recursively "." lib))
(with-directory-excursion "bin" (with-directory-excursion "bin"
(copy-files-to-directory (find-files ".") bin)) (copy-files-to-directory (find-files ".") bin))
(with-directory-excursion "scmutils/manual" (with-directory-excursion "scmutils/manual"
(copy-files-to-directory (find-files ".") doc)) (copy-files-to-directory (find-files ".") doc))
#t))) #t)))
(add-after 'install 'emacs-helpers (add-after 'install 'emacs-helpers
;; Add convenience Emacs commands to easily load the ;; Add convenience Emacs commands to easily load the
;; Scmutils band in an MIT-Scheme buffer inside of Emacs ;; Scmutils band in an MIT-Scheme buffer inside of Emacs
;; and to easily load code tags. ;; and to easily load code tags.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(mit-root (assoc-ref inputs "mit-scheme")) (mit-root (assoc-ref inputs "mit-scheme"))
(emacs-lisp-dir (emacs-lisp-dir
(string-append out "/share/emacs/site-lisp" (string-append out "/share/emacs/site-lisp"
"/guix.d/" ,name "-" ,version)) "/guix.d/" ,name "-" ,version))
(el-file (string-append emacs-lisp-dir (el-file (string-append emacs-lisp-dir
"/scmutils.el")) "/scmutils.el"))
(lib-relative-path (lib-relative-path
(string-append "/lib/mit-scheme-" (string-append "/lib/mit-scheme-"
,(system-suffix)))) ,(system-suffix))))
(mkdir-p emacs-lisp-dir) (mkdir-p emacs-lisp-dir)
(call-with-output-file el-file (call-with-output-file el-file
(lambda (p) (lambda (p)
(format p (format p
";;;###autoload ";;;###autoload
(defun scmutils-load () (defun scmutils-load ()
(interactive) (interactive)
(require 'xscheme) (require 'xscheme)