me
/
guix
Archived
1
0
Fork 0
Code

gnu: emacs-haskell-mode: Adjust indentation. 

* gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Adjust indentation.
master
Brett Gilio 2019-12-27 19:29:52 -06:00
parent 0546537f9d
commit e0f88157c1
No known key found for this signature in database
GPG Key ID: 672243C4A03F0EEE
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -711,8 +711,8 @@ replacement.")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/haskell/haskell-mode") (url "https://github.com/haskell/haskell-mode")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq")) (base32 "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq"))
@ -740,47 +740,47 @@ replacement.")
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-before (add-before
'build 'pre-build '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 (string-append (assoc-ref inputs "bash") "/bin/sh"))) (let ((sh (string-append (assoc-ref inputs "bash") "/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))
;; embed filename to fix test failure ;; embed filename to fix test failure
(let ((file "tests/haskell-cabal-tests.el")) (let ((file "tests/haskell-cabal-tests.el"))
(substitute* file (substitute* file
(("\\(buffer-file-name\\)") (("\\(buffer-file-name\\)")
(format #f "(or (buffer-file-name) ~s)" file)))) (format #f "(or (buffer-file-name) ~s)" file))))
#t))) #t)))
(replace (replace
'install 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(el-dir (string-append out "/share/emacs/site-lisp")) (el-dir (string-append out "/share/emacs/site-lisp"))
(doc (string-append (doc (string-append
out "/share/doc/haskell-mode-" ,version)) out "/share/doc/haskell-mode-" ,version))
(info (string-append out "/share/info"))) (info (string-append out "/share/info")))
(define (copy-to-dir dir files) (define (copy-to-dir dir files)
(for-each (lambda (f) (for-each (lambda (f)
(install-file f dir)) (install-file f dir))
files)) 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?"))
;; These are part of other packages. ;; These are part of other packages.