all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Rostislav Svoboda <rostislav.svoboda@gmail.com>
To: Liliana Marie Prikler <liliana.prikler@gmail.com>
Cc: 66562@debbugs.gnu.org,
	Katherine Cox-Buday <cox.katherine.e+guix@gmail.com>,
	Andrew Tropin <andrew@trop.in>
Subject: [bug#66562] [PATCH] gnu: emacs-haskell-snippets: Fix haskell-snippets-dir value.
Date: Sun, 15 Oct 2023 19:21:29 +0200	[thread overview]
Message-ID: <CAEtmmeyLJHWVwff02yjpJV7A9kUrjJZL0j17dXFioaazezaGvA@mail.gmail.com> (raw)
In-Reply-To: <b18a939607c668379da5dd935e6388706cc484e8.camel@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 1072 bytes --]

> > +                (emacs-substitute-sexps "haskell-snippets.el"
> > +                  ("setq haskell-snippets-dir"
> > +                   '(file-name-parent-directory
> > +                     (file-name-directory load-file-name))))))
> There is actually a substitute-sexps specialization for variables.
> Perhaps use that instead?

The emacs-substitute-variables doesn't work since haskell-snippets-dir
is defined using setq, not defcustom, hence I used the
emacs-substitute-sexps.

> > * gnu/packages/emacs-xyz.scm (emacs-haskell-snippets): Fix
> > haskell-snippets-dir value
> >
> > The value of haskell-snippets-dir was:
> >   /gnu/store/*-emacs-haskell-snippets-*/share/emacs/site-
> > lisp/haskell-snippets-*/
> > It needs to be:
> >   /gnu/store/*-emacs-haskell-snippets-*/share/emacs/site-lisp/
> >
> > The error was (abbreviated):
> > No such file or directory, /gnu/store/*-emacs-haskell-snippets-
> > */share/emacs/site-lisp/haskell-snippets-*/snippets
>
> Explanations go above the ChangeLog.

Ok, I changed that. See the patch in the attachment.

Cheers

[-- Attachment #2: 0001-gnu-emacs-haskell-snippets-Fix-haskell-snippets-dir-.patch --]
[-- Type: text/x-patch, Size: 1676 bytes --]

From ad1db1742216054abd406988b6ce9b3bb5cb18ec Mon Sep 17 00:00:00 2001
Message-ID: <ad1db1742216054abd406988b6ce9b3bb5cb18ec.1697390351.git.Rostislav.Svoboda@gmail.com>
From: Rostislav Svoboda <Rostislav.Svoboda@gmail.com>
Date: Sun, 15 Oct 2023 17:04:57 +0200
Subject: [PATCH] gnu: emacs-haskell-snippets: Fix haskell-snippets-dir value.

The error is (abbreviated):
No such file or directory, /gnu/store/*-emacs-haskell-snippets-*/share/emacs/site-lisp/haskell-snippets-*/snippets

The value of haskell-snippets-dir was:
  /gnu/store/*-emacs-haskell-snippets-*/share/emacs/site-lisp/haskell-snippets-*/
It needs to be:
  /gnu/store/*-emacs-haskell-snippets-*/share/emacs/site-lisp/

* gnu/packages/emacs-xyz.scm (emacs-haskell-snippets): Fix
haskell-snippets-dir value
---
 gnu/packages/emacs-xyz.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index bb8c25f9b5..8bb0d6d43a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -35545,6 +35545,12 @@ (define-public emacs-haskell-snippets
        (list
         #:phases
         #~(modify-phases %standard-phases
+            (add-after 'unpack 'patch-haskell-snippets-dir
+              (lambda* (#:key outputs #:allow-other-keys)
+                (emacs-substitute-sexps "haskell-snippets.el"
+                  ("setq haskell-snippets-dir"
+                   '(file-name-parent-directory
+                     (file-name-directory load-file-name))))))
             (add-after 'install 'install-snippets
               (lambda _
                 (let ((snippets

base-commit: a0d2ecde943bd1854ddbb7c0cad35a1fc64dc5ab
-- 
2.41.0


  reply	other threads:[~2023-10-15 17:23 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-15 15:17 [bug#66562] [PATCH] gnu: emacs-haskell-snippets: Fix haskell-snippets-dir value Rostislav Svoboda
2023-10-15 16:01 ` Liliana Marie Prikler
2023-10-15 17:21   ` Rostislav Svoboda [this message]
2023-10-15 18:25 ` [bug#66562] [PATCH v3] gnu: emacs-haskell-snippets: Use correct directory for snippets Liliana Marie Prikler
2023-10-16 10:57   ` Rostislav Svoboda
2023-10-16 16:57     ` Liliana Marie Prikler
2023-10-17 16:49       ` Rostislav Svoboda
2023-10-17 17:29         ` Liliana Marie Prikler
2023-10-18  8:54           ` Rostislav Svoboda
2023-10-18 21:58             ` Liliana Marie Prikler
2023-10-23  7:58   ` bug#66562: " Liliana Marie Prikler

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=CAEtmmeyLJHWVwff02yjpJV7A9kUrjJZL0j17dXFioaazezaGvA@mail.gmail.com \
    --to=rostislav.svoboda@gmail.com \
    --cc=66562@debbugs.gnu.org \
    --cc=andrew@trop.in \
    --cc=cox.katherine.e+guix@gmail.com \
    --cc=liliana.prikler@gmail.com \
    /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.