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

gnu: ert-runner: Adjust ert-runner wrapper to honor EMACSLOADPATH. 

* gnu/packages/emacs.scm (ert-runner): Use 'prefix instead of '= for setting
the EMACSLOADPATH environment variable. Reuse the already computed
EMACSLOADPATH for wrap-program. Specify the dependencies directly in the
inputs field.

Signed-off-by: Arun Isaac <arunisaac@systemreboot.net>
This commit is contained in:
Maxim Cournoyer 2018-02-12 22:11:38 -05:00 committed by Arun Isaac
parent d1d41db6bb
commit 9490c411f0
No known key found for this signature in database
GPG Key ID: 2E25EE8B61802BB3
1 changed files with 41 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
gnu/packages/emacs.scm
View File

@ -6176,64 +6176,49 @@ Emacs.")
;; Tests for ert-runner have a circular dependency with ecukes, and therefore ;; Tests for ert-runner have a circular dependency with ecukes, and therefore
;; cannot be run ;; cannot be run
(define-public ert-runner (define-public ert-runner
(let ((dependencies (package
`(("emacs-ansi" ,emacs-ansi) (name "ert-runner")
("emacs-commander" ,emacs-commander) (version "0.7.0")
("emacs-dash" ,emacs-dash) (source
("emacs-f" ,emacs-f) (origin
("emacs-s" ,emacs-s) (method url-fetch)
("emacs-shut-up" ,emacs-shut-up)))) (uri (string-append "https://github.com/rejeep/ert-runner.el/archive/v"
(package version ".tar.gz"))
(name "ert-runner") (file-name (string-append name "-" version ".tar.gz"))
(version "0.7.0") (sha256
(source (base32
(origin "1657nck9i96a4xgl8crfqq0s8gflzp21pkkzwg6m3z5npjxklgwp"))))
(method url-fetch) (build-system emacs-build-system)
(uri (string-append "https://github.com/rejeep/ert-runner.el/archive/v" (inputs
version ".tar.gz")) `(("emacs-ansi" ,emacs-ansi)
(file-name (string-append name "-" version ".tar.gz")) ("emacs-commander" ,emacs-commander)
(sha256 ("emacs-dash" ,emacs-dash)
(base32 ("emacs-f" ,emacs-f)
"1657nck9i96a4xgl8crfqq0s8gflzp21pkkzwg6m3z5npjxklgwp")))) ("emacs-s" ,emacs-s)
(build-system emacs-build-system) ("emacs-shut-up" ,emacs-shut-up)))
(inputs dependencies) (arguments
(arguments `(#:phases
`(#:phases (modify-phases %standard-phases
(modify-phases %standard-phases (add-after 'install 'install-executable
(add-after 'install 'install-executable (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"))) (substitute* "bin/ert-runner"
(substitute* "bin/ert-runner" (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)")
(("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") (string-append "ERT_RUNNER=\"" out
(string-append "ERT_RUNNER=\"" out "/share/emacs/site-lisp/guix.d/"
"/share/emacs/site-lisp/guix.d/" ,name "-" ,version)))
,name "-" ,version))) (install-file "bin/ert-runner" (string-append out "/bin"))
(install-file "bin/ert-runner" (string-append out "/bin")) (wrap-program (string-append out "/bin/ert-runner")
(wrap-program (string-append out "/bin/ert-runner") (list "EMACSLOADPATH" ":" 'prefix
(list "EMACSLOADPATH" ":" '= (string-split (getenv "EMACSLOADPATH") #\:)))
(append #t))))
,(match dependencies #:include (cons* "^reporters/.*\\.el$" %default-include)))
(((labels packages) ...) (home-page "https://github.com/rejeep/ert-runner.el")
`(map (lambda (label package version) (synopsis "Opinionated Ert testing workflow")
(string-append (assoc-ref inputs label) (description "@code{ert-runner} is a tool for Emacs projects tested
"/share/emacs/site-lisp/guix.d/"
(string-drop package 6)
"-" version))
',labels
',(map package-name packages)
',(map package-version packages))))
;; empty element to include the default load path as
;; determined by emacs' standard initialization
;; procedure
(list ""))))
#t))))
#:include (cons* "^reporters/.*\\.el$" %default-include)))
(home-page "https://github.com/rejeep/ert-runner.el")
(synopsis "Opinionated Ert testing workflow")
(description "@code{ert-runner} is a tool for Emacs projects tested
using ERT. It assumes a certain test structure setup and can therefore make using ERT. It assumes a certain test structure setup and can therefore make
running tests easier.") running tests easier.")
(license license:gpl3+)))) (license license:gpl3+)))
(define-public emacs-disable-mouse (define-public emacs-disable-mouse
(package (package