From patchwork Sun Oct 15 17:21:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Svoboda X-Patchwork-Id: 54840 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 23D5F27BBEA; Sun, 15 Oct 2023 18:23:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 03CA127BBE2 for ; Sun, 15 Oct 2023 18:23:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qs4pG-0002Z3-4e; Sun, 15 Oct 2023 13:22:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qs4p4-0002Yb-9V for guix-patches@gnu.org; Sun, 15 Oct 2023 13:22:38 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qs4p4-00062T-1f for guix-patches@gnu.org; Sun, 15 Oct 2023 13:22:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qs4pS-0006GD-2H for guix-patches@gnu.org; Sun, 15 Oct 2023 13:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66562] [PATCH] gnu: emacs-haskell-snippets: Fix haskell-snippets-dir value. Resent-From: Rostislav Svoboda Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Oct 2023 17:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66562 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 66562@debbugs.gnu.org, Katherine Cox-Buday , Andrew Tropin Received: via spool by 66562-submit@debbugs.gnu.org id=B66562.169739056024030 (code B ref 66562); Sun, 15 Oct 2023 17:23:02 +0000 Received: (at 66562) by debbugs.gnu.org; 15 Oct 2023 17:22:40 +0000 Received: from localhost ([127.0.0.1]:54053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs4p6-0006FW-8A for submit@debbugs.gnu.org; Sun, 15 Oct 2023 13:22:40 -0400 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]:46086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs4p2-0006FG-HE for 66562@debbugs.gnu.org; Sun, 15 Oct 2023 13:22:39 -0400 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-507a98517f3so726972e87.0 for <66562@debbugs.gnu.org>; Sun, 15 Oct 2023 10:22:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697390526; x=1697995326; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=4iUk/o+jSaGscThebuq6g+xhch8nW8eGOlQglL2gacA=; b=QwdvbW3praHTHxAELy6DIJQvzPywHv9V/wO3zUfE4mJCRSSr1/ODdQJxj18235vPrJ jdnSAJ7/YKaywR21zDrahFhsnzV+FHLUCZQto3fNEqgIztWvrIkkzYmIDAojOGz1uKlG 8HrxK1rkOhTwU8Eap/NDynbKSpN1ek2pHy31IHRJHCKMFhHzX8YeGx+eI5bQwGggeOcT iDgX8vXorvmHoSl+cFAWTyRF9PfoZKyP8jCPH0FWWae3kWa+jsttcbAneB2bs5gTUcGC 0j8srHZKWgSIlrLopcVpj0qqufM/coGi2gQ3Yxih/Ty0mAfSLs322AkRt1HBXxfVvpay hSuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697390526; x=1697995326; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4iUk/o+jSaGscThebuq6g+xhch8nW8eGOlQglL2gacA=; b=YqLYTxQbH7zrlEuDflD9OY0rWe4kDHSZVAGWs1WpW3O4q/otcLw0mgbxuAh5Q6Mv56 afjJHLwm8ZB6OPiFIm2GThiX16IhABB181wpOLMaOjl1x8FZhR+/wuNr4nKCtihPOvS+ ZmnhssZTWb2HZuR7KnxPGQNciMSKh9u3cN6Ui8oArcVg6kC2m/DXs4tir7g5yx5+4v+H D6b+QzSX7G/5k4u6O8FqyRVljd09N3Lyy5HZ6RO87M9/zhopL+kKT1J+jl8QlTQLic3i 7H0+kckwJ9CtgtWUfyQJM86CaGd0efZP8+sVB5ex1jeWW0XyeXm9GHqgDSGes7YfbvwD l6wg== X-Gm-Message-State: AOJu0Yzt7w0oRRFXbmYam2FVOK1bzR7/1BIF2wWzcuzVMjU5kvVWMFqS +Ld5UoCgUAdvxTxwugqzlpfrKsvCAp4QTagsiUU= X-Google-Smtp-Source: AGHT+IE1AlPhsTbFdsB0NRTKmY5+4GXx6KKKDT0hTz8OmQpJ8uQR0AURX0Ivq5zVyniGsbdFF2JEHsLsnTCwHMQ9tMM= X-Received: by 2002:a05:6512:ad1:b0:500:90d1:90a6 with SMTP id n17-20020a0565120ad100b0050090d190a6mr33361259lfu.63.1697390525757; Sun, 15 Oct 2023 10:22:05 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Rostislav Svoboda Date: Sun, 15 Oct 2023 19:21:29 +0200 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches > > + (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 From ad1db1742216054abd406988b6ce9b3bb5cb18ec Mon Sep 17 00:00:00 2001 Message-ID: From: Rostislav Svoboda 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