From patchwork Sun Oct 15 18:25:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 54845 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 3877427BBE9; Sun, 15 Oct 2023 19:36:59 +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=unavailable 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 978A027BBE2 for ; Sun, 15 Oct 2023 19:36:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qs5yh-00065f-U7; Sun, 15 Oct 2023 14:36:39 -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 1qs5yg-00065K-Gu for guix-patches@gnu.org; Sun, 15 Oct 2023 14:36: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 1qs5yg-0000s9-8Z for guix-patches@gnu.org; Sun, 15 Oct 2023 14:36:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qs5z4-0000Bo-EX for guix-patches@gnu.org; Sun, 15 Oct 2023 14:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66562] [PATCH v3] gnu: emacs-haskell-snippets: Use correct directory for snippets. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Oct 2023 18:37: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: 66562@debbugs.gnu.org Cc: Rostislav Svoboda Received: via spool by 66562-submit@debbugs.gnu.org id=B66562.1697395012699 (code B ref 66562); Sun, 15 Oct 2023 18:37:02 +0000 Received: (at 66562) by debbugs.gnu.org; 15 Oct 2023 18:36:52 +0000 Received: from localhost ([127.0.0.1]:54115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs5yt-0000BD-Nv for submit@debbugs.gnu.org; Sun, 15 Oct 2023 14:36:52 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:56591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs5yr-0000Ay-6q for 66562@debbugs.gnu.org; Sun, 15 Oct 2023 14:36:50 -0400 Received: by mail-wm1-x342.google.com with SMTP id 5b1f17b1804b1-40572aeb6d0so37815035e9.1 for <66562@debbugs.gnu.org>; Sun, 15 Oct 2023 11:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697394979; x=1697999779; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=VXIGQbb/j4tXsQ0cd/p/XByxhbf5S6SGKU2Jtx1ybv4=; b=nOpTRXPuFGfyOYjTlv+ODdycMAz1NmzVN0ZHez4fteweV03I515fa3/To9sP0gLoIM CWqI+Irtbe5FCiUJaYlMdc/ANMdW4I5LEr66t5bkkCifwSGE0wAtJEj8C6nOSRgDPGxJ 0HwafEVtbfkUj+ombIM93ixhn8cFw1VsrBv5RYZvvXahXfBUW9n3EzjLFC978PnqMRqV lbGrR94GtjgBJYRGe7Z7Qo42z4hZOx/po2vNeFnZAuVVZoo72nKi0B7EY//att9bluy8 Q3X98iYfG1HIv2fJ7V9pUHNblK1uA7brQV8J9YIa4VAVllmSxPApP7tJRDp1Au/GNrtu qd2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697394979; x=1697999779; h=mime-version:cc:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=VXIGQbb/j4tXsQ0cd/p/XByxhbf5S6SGKU2Jtx1ybv4=; b=WTolrXdln9SL1nE9SisB1xfc7X7pfw5oLugwVFrYOu6XENi6SE5nTpGQC2KiX08cic Cn/68IPbh9UiD4g5vDMNMIpqIbCfamebl3Wa+OXOxiF4cu+eJw6fDaEWSdIAZknt0zub h0d7hcyIa7JBzfiZXyuqJ7RYipwT7R6NUrEm63LypHLjxmtn1v4vjtHuj5uHAg9Otzqz aaSGTeMGVRZESqnqbR2Skd+Cuv7PIxhr1izqThli6xO44ZyJWYUi1M2wAMF68qLieUDO liuaouQc5C3yko4nCRpVivPIWZ+IpkD+E8Q4TKQe583cdcxO25LuNTx86gsdihqTZGJl DG9A== X-Gm-Message-State: AOJu0YzaTrXkSWdZPDdM7BdwZU26VN1jQMH7ERMh6jJx/WMBrR0rvbug H6LkCQMd4/Qz/t+mntv8IRvQPeYstLG+gA== X-Google-Smtp-Source: AGHT+IHpodFugOUKdXNVeWERT+2IqSaUKI16Lm0NNDYosP3kw/+rmIiPKHW3edjGwICBnmDvdeemOA== X-Received: by 2002:a7b:ca54:0:b0:405:3885:490a with SMTP id m20-20020a7bca54000000b004053885490amr28065826wml.0.1697394978466; Sun, 15 Oct 2023 11:36:18 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id t7-20020a1c7707000000b0040586360a36sm5109312wmi.17.2023.10.15.11.36.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Oct 2023 11:36:17 -0700 (PDT) Message-ID: <36c6ef9a672215883a84b8fec5a58a440d32ee11.1697394827.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sun, 15 Oct 2023 20:25:46 +0200 MIME-Version: 1.0 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 This package instructs Yasnippet to look for snippets relative to its own path. However, it installs the snippets directly to site-lisp, which as of 79cfe30f3eb10bd3dbf7aa0f6e873c945d7d0ea5 is one directory above that. Use the elpa-directory procedure introduced in that commit to rectify this mistake. * gnu/packages/emacs-xyz.scm (emacs-haskell-snippets)[#:phases] : Use elpa-directory. Fixes: 66562 --- Hi Rostislav, Am Sonntag, dem 15.10.2023 um 17:17 +0200 schrieb Rostislav Svoboda: > * 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/ Actually, emacs-haskell-snippets is doing something wrong when installing files directy to site-lisp instead of any other directory. Here's an attempt to fix that. Cheers gnu/packages/emacs-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) base-commit: ef026e68fe58ed3be216c76f7c5f008893ed3095 diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bb8c25f9b5..7f55febfbb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -35546,10 +35546,11 @@ (define-public emacs-haskell-snippets #:phases #~(modify-phases %standard-phases (add-after 'install 'install-snippets - (lambda _ + (lambda* (#:key outputs #:allow-other-keys) (let ((snippets (string-append - #$output "/share/emacs/site-lisp/snippets/haskell-mode"))) + (elpa-directory (assoc-ref outputs "out")) + "/snippets/haskell-mode"))) (mkdir-p snippets) (copy-recursively "snippets/haskell-mode" snippets))))))) (propagated-inputs