From: John Soo <jsoo1@asu.edu>
To: 40293@debbugs.gnu.org
Subject: [bug#40293] [PATCH] gnu: cedille: Fix outputs.
Date: Sat, 28 Mar 2020 13:18:28 -0700 [thread overview]
Message-ID: <87wo7444iz.fsf@asu.edu> (raw)
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
Hi Guix,
Cedille's emacs-mode paths needed some slight adjustment.
This also installs the info page I missed when first submitting the
package.
Thanks,
John
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: fix emacs outputs --]
[-- Type: text/x-patch, Size: 1393 bytes --]
>From 472597a80f467a78600591c3b83b727e1bdd44a2 Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Fri, 27 Mar 2020 07:46:32 -0700
Subject: [PATCH 1/2] gnu: cedille: Fix emacs outputs.
* gnu/packages/cedille.scm (cedille):[arguments] Add slashes to output paths.
---
gnu/packages/cedille.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/cedille.scm b/gnu/packages/cedille.scm
index d9cf66c501..9f6c01ea80 100644
--- a/gnu/packages/cedille.scm
+++ b/gnu/packages/cedille.scm
@@ -56,12 +56,15 @@
(let ((out (assoc-ref outputs "out")))
(substitute* "cedille-mode.el"
(("/usr/share/emacs/site-lisp/cedille-mode")
- (string-append out "/share/emacs/site-lisp")))
+ (string-append
+ out "/share/emacs/site-lisp/cedille")))
#t)))
(add-after 'unpack 'copy-cedille-mode
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (lisp (string-append out "/share/emacs/site-lisp")))
+ (lisp
+ (string-append
+ out "/share/emacs/site-lisp/cedille/")))
(mkdir-p (string-append lisp "cedille-mode"))
(copy-recursively
"cedille-mode"
--
2.26.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: add info --]
[-- Type: text/x-patch, Size: 1984 bytes --]
>From 45f8563a1d0a32763b43966b214902571ec7c6cb Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Sat, 28 Mar 2020 10:30:48 -0700
Subject: [PATCH 2/2] gnu: cedille: Install the info pages.
* gnu/packages/cedille.scm (cedille):[arguments] Install the info pages.
---
gnu/packages/cedille.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/cedille.scm b/gnu/packages/cedille.scm
index 9f6c01ea80..d3dd576323 100644
--- a/gnu/packages/cedille.scm
+++ b/gnu/packages/cedille.scm
@@ -51,15 +51,19 @@
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-cedille-path-el
+ (add-after 'unpack 'patch-cedille-paths
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* "cedille-mode.el"
(("/usr/share/emacs/site-lisp/cedille-mode")
(string-append
out "/share/emacs/site-lisp/cedille")))
+ (substitute* "cedille-mode/cedille-mode-info.el"
+ (("\\(concat cedille-path-el \"cedille-info-main.info\"\\)")
+ (string-append
+ "\"" out "/share/info/cedille-info-main.info.gz\"")))
#t)))
- (add-after 'unpack 'copy-cedille-mode
+ (add-after 'patch-cedille-paths 'copy-cedille-mode
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lisp
@@ -107,6 +111,8 @@
(install-file "cedille" (string-append out "/bin"))
(install-file "core/cedille-core"
(string-append out "/bin"))
+ (install-file "docs/info/cedille-info-main.info"
+ (string-append out "/share/info"))
#t))))))
(home-page "https://cedille.github.io/")
(synopsis
--
2.26.0
next reply other threads:[~2020-03-30 2:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-28 20:18 John Soo [this message]
2020-04-02 16:44 ` bug#40293: [PATCH] gnu: cedille: Fix outputs Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wo7444iz.fsf@asu.edu \
--to=jsoo1@asu.edu \
--cc=40293@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.