From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 2JenGnIXLWUntwAAauVa8A:P1 (envelope-from ) for ; Mon, 16 Oct 2023 12:58:58 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 2JenGnIXLWUntwAAauVa8A (envelope-from ) for ; Mon, 16 Oct 2023 12:58:58 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 003A76FDB3 for ; Mon, 16 Oct 2023 12:58:57 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=DHaKExRi; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1697453938; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=jIBxWVopsb3FgSk8AfnZFWJT1+F5PiM9PXAbe9dl8rM=; b=sROWKF2Kdyl7YZ2+6fLuZu8hWcq/ZGNW6PyZrp3Yql1CMr+amoNIX/SVBuEVh9DNV/i2Fj hBnlrXxPAhItcRD5yEzshGJ+JTvmTg61zA1iuWkgf8/fg+FzT/qNAjZrvnSUgQiuPRidSN o+rXx0ogxapqXX6AWiFHYwPB6qS9rtnfdm6m+0syJo4MigyqY2trpt7BB2ONBrYI9kQks7 6uusrRSCoIdSouJPi62bXfS/7nSp/MUq+x1AmIfMjJxCOWDCmJgfzs+gHZQreEPxKFDKzk sPRHu+ejQaMTkVNyGcD6256yUBDt2feYlAeIO7mbYi5Jg/lzX5gViV8aPBLWXA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1697453938; a=rsa-sha256; cv=none; b=iIlNrhf4McIWfK7p45DLhvgQYlDgOSj7ZfmUFVS6wNOzCq2HZcxgLVYvUFgjb6Ku02Io4K KI+idQQ2CR4n1VJJVZ6IDgLE3Mc3+MWT5d4bn1PWMdoVpTVTF3PDw2LKkoBATWyhsJGPyO B51DnrPDU+7Xu64Sxzxj9J0O42WgYn6u1J8+F6tAxY/9P5nD5FNWnYiHixhA81FiGBd2v3 adBNT2rRcesKcsDdN7F+F9DdMxSrRfhu7ShujU4EBIhEJufpktnUHO8PRRHWPf4e7sMKR+ N1kIH4ZtdiuGi4AnjIsGOoOqfXk+ngckBjgJtrhDJwAIRXyJ1opNSGKOqOljvw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=DHaKExRi; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qsLJ1-0005PO-P1; Mon, 16 Oct 2023 06:58: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 1qsLJ0-0005PF-Kb for guix-patches@gnu.org; Mon, 16 Oct 2023 06:58: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 1qsLJ0-0000ts-86 for guix-patches@gnu.org; Mon, 16 Oct 2023 06:58:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qsLJN-00024f-RQ for guix-patches@gnu.org; Mon, 16 Oct 2023 06:59:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66562] [PATCH v3] gnu: emacs-haskell-snippets: Use correct directory for snippets. Resent-From: Rostislav Svoboda Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Oct 2023 10:59:01 +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 Received: via spool by 66562-submit@debbugs.gnu.org id=B66562.16974539257947 (code B ref 66562); Mon, 16 Oct 2023 10:59:01 +0000 Received: (at 66562) by debbugs.gnu.org; 16 Oct 2023 10:58:45 +0000 Received: from localhost ([127.0.0.1]:55353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qsLJ7-000247-AK for submit@debbugs.gnu.org; Mon, 16 Oct 2023 06:58:45 -0400 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]:48266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qsLJ5-00023n-JI for 66562@debbugs.gnu.org; Mon, 16 Oct 2023 06:58:44 -0400 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-507a62d4788so2268437e87.0 for <66562@debbugs.gnu.org>; Mon, 16 Oct 2023 03:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697453893; x=1698058693; 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=jIBxWVopsb3FgSk8AfnZFWJT1+F5PiM9PXAbe9dl8rM=; b=DHaKExRikurfGNWiHep0rQZKos2dXgA5piXhUI2JSSuoyzFO4QnZhmVcGfdPAwBrdD jpO4noAOU98A7ox2CfY8md3e1AfYsOM8D0wfRZm7qbyvbtFE0F0nt1CvFLKn0l71+Il7 6BW37IXsM8BSzx0HTMiJ5osO6w3kTBkO+VlKEzZ75brjbjHiumH6MXRRL78uqyNFzyYv j76Euj4FHfVcPwqphJ3J3shRUFdfWZkAR9jFNf6LJM+7QFLl/qmZ4HeQVMkSt4MAPDb1 cODSf1BJp2IPwshIQQM06L3IyzJ/RJs2cIF7Fp6ZEeRnW8JBRz8/UZMoi3qAJh8Kza/b rWJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697453893; x=1698058693; 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=jIBxWVopsb3FgSk8AfnZFWJT1+F5PiM9PXAbe9dl8rM=; b=huyi2fdJGZd81NA3JefE6/NamOrTaMmqeJJgrEseUll+rlimZp3Ce1GjOpUk3LYOuU aL8pLw7uhQunVEwy/rQZbel3vxL0Di80N02OmPG3mJAZbwAjEqFiUdU+b1PgGaUOkqMJ UVSaVVGgwpgu9g+QZmWU5kFPjJgF/uCNLD3hsypVATiU2l8eZ+LG6nzZXckedI9iBX6Y 48cWQq992BBqW/uHHo7V9HluFa/jkd/XhU5OI4YYSiE9wL3LHq8ZDSBspLZ0Y3ZuY9C3 OKGvp9825WhWzW1Q3S5nhWc1e3V7GGYRzUbufkOHbSHSPbAVcJoeH80QSAF1fxjHRea0 piTg== X-Gm-Message-State: AOJu0YzAHzDF1XKVi8d5fvhTn8A6rwfehRPpRTxbnprk9cPk78p/YNqU xaFcRgpB4/hiuFV5iVCJKt1yxN0ILAQHtnNWjWw= X-Google-Smtp-Source: AGHT+IHJwk+9U43ponvgnT3+ACD2tsukmhZIkoqzNa/nZFhGC2/R3uzXkWTKyDK4xppXLMnXDL66Dg36q8oMDmtVRg4= X-Received: by 2002:a05:6512:31d0:b0:4ff:a04c:8a5b with SMTP id j16-20020a05651231d000b004ffa04c8a5bmr34242919lfe.47.1697453892350; Mon, 16 Oct 2023 03:58:12 -0700 (PDT) MIME-Version: 1.0 References: <36c6ef9a672215883a84b8fec5a58a440d32ee11.1697394827.git.liliana.prikler@gmail.com> In-Reply-To: <36c6ef9a672215883a84b8fec5a58a440d32ee11.1697394827.git.liliana.prikler@gmail.com> From: Rostislav Svoboda Date: Mon, 16 Oct 2023 12:57:35 +0200 Message-ID: Content-Type: multipart/mixed; boundary="000000000000474dde0607d348a2" 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: 2.93 X-Migadu-Queue-Id: 003A76FDB3 X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: 2.93 X-TUID: a1bGFYMNU5NA --000000000000474dde0607d348a2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Liliana, Your patch works (thank you) and I improved it a tiny bit. (See attachment.) BTW shouldn't the revision number in the (git-version "0.1.0" "1" commit) be increased to "2" in your patch and to "3" in mine? Cheers Le dim. 15 oct. 2023 =C3=A0 20:36, Liliana Marie Prikler a =C3=A9crit : > > 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. Us= e the > elpa-directory procedure introduced in that commit to rectify this mistak= e. > > * 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-s= nippets-*/ > > 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 t= o fix > that. > > Cheers > > gnu/packages/emacs-xyz.scm | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > 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/haskel= l-mode"))) > + (elpa-directory (assoc-ref outputs "out")) > + "/snippets/haskell-mode"))) > (mkdir-p snippets) > (copy-recursively "snippets/haskell-mode" snippets))))= ))) > (propagated-inputs > > base-commit: ef026e68fe58ed3be216c76f7c5f008893ed3095 > -- > 2.41.0 > --000000000000474dde0607d348a2 Content-Type: application/x-patch; name="0001-gnu-emacs-haskell-snippets-Improve-snippets-installa.patch" Content-Disposition: attachment; filename="0001-gnu-emacs-haskell-snippets-Improve-snippets-installa.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lnss0lr60 RnJvbSAyZmEzYjg3NmIyZjVmOTY3NTEwMjA1YmFkYWIxZjY4NjVkNTQ4ZjYwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlEOiA8MmZhM2I4NzZiMmY1Zjk2NzUxMDIwNWJhZGFiMWY2 ODY1ZDU0OGY2MC4xNjk3NDUyNjU5LmdpdC5Sb3N0aXNsYXYuU3ZvYm9kYUBnbWFpbC5jb20+CkZy b206IFJvc3Rpc2xhdiBTdm9ib2RhIDxSb3N0aXNsYXYuU3ZvYm9kYUBnbWFpbC5jb20+CkRhdGU6 IE1vbiwgMTYgT2N0IDIwMjMgMTI6Mjk6MjAgKzAyMDAKU3ViamVjdDogW1BBVENIXSBnbnU6IGVt YWNzLWhhc2tlbGwtc25pcHBldHM6IEltcHJvdmUgc25pcHBldHMgaW5zdGFsbGF0aW9uLgoKRFJZ IGluIHRoZSBzcGVjaWZpY2F0aW9uIG9mIHRoZSByZWxhdGl2ZSBwYXRoIG9mIHRoZSBzbmlwcGV0 cyBkaXJlY3RvcnkuCgoqIGdudS9wYWNrYWdlcy9lbWFjcy14eXouc2NtIChlbWFjcy1oYXNrZWxs LXNuaXBwZXRzKVsjOnBoYXNlc10KPGluc3RhbGwtc25pcHBldHM+OiBJbXByb3ZlIHNuaXBwZXRz IGluc3RhbGxhdGlvbi4KLS0tCiBnbnUvcGFja2FnZXMvZW1hY3MteHl6LnNjbSB8IDEyICsrKysr Ky0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvZW1hY3MteHl6LnNjbSBiL2dudS9wYWNrYWdlcy9l bWFjcy14eXouc2NtCmluZGV4IDdmNTVmZWJmYmIuLjllMGQyNWQwNmYgMTAwNjQ0Ci0tLSBhL2du dS9wYWNrYWdlcy9lbWFjcy14eXouc2NtCisrKyBiL2dudS9wYWNrYWdlcy9lbWFjcy14eXouc2Nt CkBAIC0zNTU0NywxMiArMzU1NDcsMTIgQEAgKGRlZmluZS1wdWJsaWMgZW1hY3MtaGFza2VsbC1z bmlwcGV0cwogICAgICAgICAjfihtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKICAgICAg ICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ2luc3RhbGwtc25pcHBldHMKICAgICAgICAgICAg ICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAgICAgICAg ICAgICAgIChsZXQgKChzbmlwcGV0cwotICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFw cGVuZAotICAgICAgICAgICAgICAgICAgICAgICAgKGVscGEtZGlyZWN0b3J5IChhc3NvYy1yZWYg b3V0cHV0cyAib3V0IikpCi0gICAgICAgICAgICAgICAgICAgICAgICAiL3NuaXBwZXRzL2hhc2tl bGwtbW9kZSIpKSkKLSAgICAgICAgICAgICAgICAgIChta2Rpci1wIHNuaXBwZXRzKQotICAgICAg ICAgICAgICAgICAgKGNvcHktcmVjdXJzaXZlbHkgInNuaXBwZXRzL2hhc2tlbGwtbW9kZSIgc25p cHBldHMpKSkpKSkpCisgICAgICAgICAgICAgICAgKGxldCogKChyZWxhdGl2ZS1kaXJwYXRoICJz bmlwcGV0cy9oYXNrZWxsLW1vZGUiKQorICAgICAgICAgICAgICAgICAgICAgICAoaW5zdGFsbGF0 aW9uLWRpcgorICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgKGVscGEtZGly ZWN0b3J5IChhc3NvYy1yZWYgb3V0cHV0cyAib3V0IikpCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiLyIgcmVsYXRpdmUtZGlycGF0aCkpKQorICAgICAgICAgICAgICAg ICAgKG1rZGlyLXAgaW5zdGFsbGF0aW9uLWRpcikKKyAgICAgICAgICAgICAgICAgIChjb3B5LXJl Y3Vyc2l2ZWx5IHJlbGF0aXZlLWRpcnBhdGggaW5zdGFsbGF0aW9uLWRpcikpKSkpKSkKICAgICAg IChwcm9wYWdhdGVkLWlucHV0cwogICAgICAgIChsaXN0IGVtYWNzLXlhc25pcHBldCkpCiAgICAg ICAoaG9tZS1wYWdlICJodHRwczovL2dpdGh1Yi5jb20vaGFza2VsbC9oYXNrZWxsLXNuaXBwZXRz IikKCmJhc2UtY29tbWl0OiBhMGQyZWNkZTk0M2JkMTg1NGRkYmI3YzBjYWQzNWExZmM2NGRjNWFi CnByZXJlcXVpc2l0ZS1wYXRjaC1pZDogZjBjMGIyODAwYWRjOTVlYzFjZjJiNWM5MjZjY2EzNmM3 OGU2OTFhZApwcmVyZXF1aXNpdGUtcGF0Y2gtaWQ6IDExMWZhYzExNzY4ZDE0NWUxM2NhOTA1ZGI4 MThlYjc1MWQwZWU0NTcKcHJlcmVxdWlzaXRlLXBhdGNoLWlkOiA1YmRlODM1ZGUxZTBmN2U5Y2Q3 NTI5ODZkYTA1ODU0NjM3MTNkNzQ1CnByZXJlcXVpc2l0ZS1wYXRjaC1pZDogZjZlYjg2NzQ3YTZk MjNkYThlMjRjNWZmNTU1YTI5YTYwMDIyODhmNApwcmVyZXF1aXNpdGUtcGF0Y2gtaWQ6IDJkOGFh MzViZWIzZDlmOThhMzNhNWEwNGU5MDM0ODgyM2JhNzA0ZTAKcHJlcmVxdWlzaXRlLXBhdGNoLWlk OiAyYzUzMTI1ZDkzYWNkYmU5ZTY4MjE4YjIwMTU0MTRmNTQzNWU3YzkyCi0tIAoyLjQxLjAKCg== --000000000000474dde0607d348a2--