gnu: emacs: Partially revert 'guix style'd emacs packages.

This is a follow up to commit 88097dfba7, which
styled many Emacs packages with 'guix style'.

* gnu/packages/emacs-xyz.scm (emacs-shroud): Revert to previous version.
(emacs-howm): Likewise.
(emacs-ob-sclang)[propagated-inputs]: Replace emacs-emacs by emacs-org and
org-scel by emacs-scel.
This commit is contained in:
Maxim Cournoyer 2021-12-14 18:05:00 -05:00
parent 8a96bf4c74
commit a284e56de4
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -1300,19 +1300,18 @@ (define-public emacs-shroud
(base32 "0q2pb3w8s833fjhkzicciw2php4lsnismad1dnwgp2lcway757ra"))))
(build-system gnu-build-system)
(arguments
(list
#:modules '((guix build gnu-build-system)
`(#:modules ((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils))
#:imported-modules `(,@%gnu-build-system-modules
#:imported-modules (,@%gnu-build-system-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:configure-flags #~(list (string-append "--with-lispdir="
(emacs:elpa-directory #$output)))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'expand-load-path
(assoc-ref emacs:%standard-phases 'expand-load-path)))))
#:configure-flags (list (string-append "--with-lispdir="
(emacs:elpa-directory %output)))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'expand-load-path
(assoc-ref emacs:%standard-phases 'expand-load-path)))))
(native-inputs
(list autoconf automake texinfo perl emacs-minimal))
(propagated-inputs
@ -2685,19 +2684,18 @@ (define-public emacs-howm
(native-inputs
(list emacs-minimal))
(arguments
(list
#:configure-flags
#~(list (string-append "--with-howmdir=" (emacs:elpa-directory #$output)))
#:modules '((guix build gnu-build-system)
`(#:configure-flags
(list (string-append "--with-howmdir=" (emacs:elpa-directory %output)))
#:modules ((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:)
(guix build utils))
#:imported-modules `(,@%gnu-build-system-modules
#:imported-modules (,@%gnu-build-system-modules
(guix build emacs-build-system)
(guix build emacs-utils))
#:phases
(modify-phases %standard-phases
(add-after 'install 'make-autoloads
(assoc-ref emacs:%standard-phases 'make-autoloads)))))
#:phases
(modify-phases %standard-phases
(add-after 'install 'make-autoloads
(assoc-ref emacs:%standard-phases 'make-autoloads)))))
(home-page "https://howm.osdn.jp/")
(synopsis "Note-taking tool for Emacs")
(description "Howm is a note-taking tool for Emacs. Like
@ -12269,7 +12267,7 @@ (define-public emacs-ob-sclang
(delete-file file)))
(find-files "." "\\.el"))))))
(propagated-inputs
(list emacs-emacs org-scel))
(list emacs-org emacs-scel))
(synopsis "Org Babel support for SuperCollider")
(description "This package adds support for evaluating @code{sclang}
Org mode source blocks. It is extracted from the @code{emacs-org-contrib}