futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: emacs-haskell-mode: Use new style.

Browse Source 
* gnu/packages/emacs-xyz.scm (emacs-haskell-mode)[arguments]: Use gexps.
This commit is contained in:
Nicolas Goaziou 2021-12-15 12:03:03 +01:00
parent 9ad779f7b5
commit 67863365f2
No known key found for this signature in database
GPG Key ID: DA00B4F048E92F2D
1 changed files with 54 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
gnu/packages/emacs-xyz.scm
View File

@ -1408,71 +1408,68 @@ replacement.")
(list emacs-minimal emacs-el-search emacs-stream texinfo)) (list emacs-minimal emacs-el-search emacs-stream texinfo))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list (string-append "EMACS=" (list
(assoc-ref %build-inputs "emacs-minimal") #:make-flags #~(list
"/bin/emacs")) (string-append "EMACS=" #$emacs-minimal "/bin/emacs"))
#:modules ((ice-9 match) #:modules `((ice-9 match)
(srfi srfi-26) (srfi srfi-26)
((guix build emacs-build-system) #:prefix emacs:) ((guix build emacs-build-system) #:prefix emacs:)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:imported-modules (,@%gnu-build-system-modules #:imported-modules `(,@%gnu-build-system-modules
(guix build emacs-build-system) (guix build emacs-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-before 'build 'pre-build (add-before 'build 'pre-build
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(define (el-dir store-dir) (define (el-dir store-dir)
(match (find-files store-dir "\\.el$") (match (find-files store-dir "\\.el$")
((f1 f2 ...) (dirname f1)) ((f1 f2 ...) (dirname f1))
(_ ""))) (_ "")))
(let ((sh (search-input-file inputs "/bin/sh"))) (let ((sh (search-input-file inputs "/bin/sh")))
(define emacs-prefix? (cut string-prefix? "emacs-" <>)) (define emacs-prefix? (cut string-prefix? "emacs-" <>))
(setenv "SHELL" "sh") (setenv "SHELL" "sh")
(setenv "EMACSLOADPATH" (setenv "EMACSLOADPATH"
(string-concatenate (string-concatenate
(map (match-lambda (map (match-lambda
(((? emacs-prefix? name) . dir) (((? emacs-prefix? name) . dir)
(string-append (el-dir dir) ":")) (string-append (el-dir dir) ":"))
(_ "")) (_ ""))
inputs))) inputs)))
(substitute* (find-files "." "\\.el") (("/bin/sh") sh)) (substitute* (find-files "." "\\.el") (("/bin/sh") sh)))))
#t))) (add-before 'check 'delete-failing-tests
(add-before 'check 'delete-failing-tests ;; XXX: these tests require GHC executable, which would be a big
;; XXX: these tests require GHC executable, which would be a big ;; native input.
;; native input. (lambda _
(lambda _ (with-directory-excursion "tests"
(with-directory-excursion "tests" ;; File `haskell-indent-tests.el' fails with
;; File `haskell-indent-tests.el' fails with ;; `haskell-indent-put-region-in-literate-2'
;; `haskell-indent-put-region-in-literate-2' ;; on Emacs 27.1+
;; on Emacs 27.1+ ;; XXX: https://github.com/haskell/haskell-mode/issues/1714
;; XXX: https://github.com/haskell/haskell-mode/issues/1714 (for-each delete-file
(for-each delete-file '("haskell-indent-tests.el"
'("haskell-indent-tests.el" "haskell-customize-tests.el"
"haskell-customize-tests.el" "inferior-haskell-tests.el")))))
"inferior-haskell-tests.el"))) (replace 'install
#t)) (lambda* (#:key outputs #:allow-other-keys)
(replace 'install (let* ((out (assoc-ref outputs "out"))
(lambda* (#:key outputs #:allow-other-keys) (el-dir (emacs:elpa-directory out))
(let* ((out (assoc-ref outputs "out")) (doc (string-append
(el-dir (emacs:elpa-directory out)) out "/share/doc/haskell-mode-" #$version))
(doc (string-append (info (string-append out "/share/info")))
out "/share/doc/haskell-mode-" ,version)) (define (copy-to-dir dir files)
(info (string-append out "/share/info"))) (for-each (lambda (f)
(define (copy-to-dir dir files) (install-file f dir))
(for-each (lambda (f) files))
(install-file f dir))
files))
(with-directory-excursion "doc" (with-directory-excursion "doc"
(invoke "makeinfo" "haskell-mode.texi") (invoke "makeinfo" "haskell-mode.texi")
(install-file "haskell-mode.info" info)) (install-file "haskell-mode.info" info))
(copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md")) (copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md"))
(copy-to-dir el-dir (find-files "." "\\.elc?")) (copy-to-dir el-dir (find-files "." "\\.elc?"))))))))
#t))))))
(home-page "https://github.com/haskell/haskell-mode") (home-page "https://github.com/haskell/haskell-mode")
(synopsis "Haskell mode for Emacs") (synopsis "Haskell mode for Emacs")
(description (description