From unknown Sat Jun 14 03:56:35 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40293] [PATCH] gnu: cedille: Fix outputs. Resent-From: John Soo Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Mar 2020 02:36:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40293 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40293@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158553573217337 (code B ref -1); Mon, 30 Mar 2020 02:36:05 +0000 Received: (at submit) by debbugs.gnu.org; 30 Mar 2020 02:35:32 +0000 Received: from lists.gnu.org ([209.51.188.17]:43807) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jIHug-0006nb-5z for submit@debbugs.gnu.org; Sat, 28 Mar 2020 16:18:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52697) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jIHue-0002iu-JF for guix-patches@gnu.org; Sat, 28 Mar 2020 16:18:38 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jIHuc-0006HR-Nn for guix-patches@gnu.org; Sat, 28 Mar 2020 16:18:35 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:45754) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jIHuc-0006G7-8w for guix-patches@gnu.org; Sat, 28 Mar 2020 16:18:34 -0400 Received: by mail-pl1-x62d.google.com with SMTP id b9so4951205pls.12 for ; Sat, 28 Mar 2020 13:18:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version; bh=tMttE5AX7jRLLf6V8zr+Ig87rRHEdkhf8tfvYFWdZJc=; b=AiYrpWufd+MTG5pjyExWsXZeVbsZALd5Cn8KXTcVYK1wd6rEiBvP6uDWeGGkr9tvSC /7hCzTE8hGeM1sK7GxCkbI9u+xrSAYdxybtnjBUhUYlX+W0hi6QKi/EC3MJNFaJGgwLi cQj9vbuZR3djyb1NUYUzD+pQg56ji7cJNm0yUhwfAAD0n4NFZ9uJ6Uw95vSgwUJ0dEG1 09eva5OH8cFkFKi2NFP0o9Hs98wvlBxn2/S6w7E6j3KdgAXksU92hq81oS7mqDWpTiom 5XSow4Rsav0nhPJceWhXWnap1+PU93twxSxrKsKhO9JTI0lLVa2vAB9w4yQP/SoUYzfG i3Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=tMttE5AX7jRLLf6V8zr+Ig87rRHEdkhf8tfvYFWdZJc=; b=Vc4ut/PJSHwrwG1prbvNou+9BBXnB7snzosPZM5tj1doXW67qT+as3o/6zuhltC+Mb lnqngn0wYiCr7bMXebtmaVAA6w6OT1BDNbDLeENyxRWvcnzQqklP4O28dtDQOa+1qYWj 4NwH/+4AtQy9vRbDxzU3LgNDhAjnZC8IjRsTOhUVyt/EDTBWZOINGwGXSvNcjhUQh9ZG CTRva8F54KEpk79tbr1MopADh3sNOjwi9hBBBco1AUhSh5s1gUFQuA9oBn6UkNIR5eDH zLAepKrGRUJ40QqKm2reHFO9jJIWN2VDUOaNNO3EwZpwa0PPQFfn8q+AK6Zi6MTIbgA4 xE4Q== X-Gm-Message-State: ANhLgQ2hpUEbqdJLSIP5Dmw9hEY3fNIbIcJFelDE7VKHJiaXSg+eiMkC Ji8Je7442OayR8rqh4xmobJxZQTip8k= X-Google-Smtp-Source: ADFU+vslnJUYOt2xUS/m816wYUVXu8eRfDoQCXnVnQyNIHsYx5KnEXUBeaEpTLQpz3KOelNsT+BB2g== X-Received: by 2002:a17:90b:d91:: with SMTP id bg17mr6739005pjb.70.1585426712206; Sat, 28 Mar 2020 13:18:32 -0700 (PDT) Received: from ecenter ([2600:1700:83b0:8bd0::6c3]) by smtp.gmail.com with ESMTPSA id s61sm6574927pjd.33.2020.03.28.13.18.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Mar 2020 13:18:31 -0700 (PDT) From: John Soo Date: Sat, 28 Mar 2020 13:18:28 -0700 Message-ID: <87wo7444iz.fsf@asu.edu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::62d X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2020 20:18:39 -0000 --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-cedille-Fix-emacs-outputs.patch Content-Description: fix emacs outputs >>From 472597a80f467a78600591c3b83b727e1bdd44a2 Mon Sep 17 00:00:00 2001 From: John Soo 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 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-cedille-Install-the-info-pages.patch Content-Description: add info >>From 45f8563a1d0a32763b43966b214902571ec7c6cb Mon Sep 17 00:00:00 2001 From: John Soo 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 --=-=-=-- From unknown Sat Jun 14 03:56:35 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: John Soo Subject: bug#40293: closed (Re: [bug#40293] [PATCH] gnu: cedille: Fix outputs.) Message-ID: References: <87zhbtrg5t.fsf@devup.no> <87wo7444iz.fsf@asu.edu> X-Gnu-PR-Message: they-closed 40293 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 40293@debbugs.gnu.org Date: Thu, 02 Apr 2020 16:45:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1585845902-1788-1" This is a multi-part message in MIME format... ------------=_1585845902-1788-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #40293: [PATCH] gnu: cedille: Fix outputs. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 40293@debbugs.gnu.org. --=20 40293: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D40293 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1585845902-1788-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 40293-done) by debbugs.gnu.org; 2 Apr 2020 16:44:40 +0000 Received: from localhost ([127.0.0.1]:40627 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jK2xL-0000RM-R9 for submit@debbugs.gnu.org; Thu, 02 Apr 2020 12:44:40 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:52213) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jK2xJ-0000Ql-Lm for 40293-done@debbugs.gnu.org; Thu, 02 Apr 2020 12:44:38 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 3858A5C025D; Thu, 2 Apr 2020 12:44:32 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 02 Apr 2020 12:44:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=jv4YLnn5Imr0Z0iItgAkac49tz whiewo3WwnVCSfigI=; b=ZcsuEsUCaVaXGUSORtoEFJQvMtaYymcVq2nHx8rMxd ojjEzXow9RdeKOshaCrBiV8rUY5N2jvfFl4JAMiT45d2Wzl5yzP2SNH66WdWUvLc 8Ctr4JYyBUm2Lr4bXmi44Gz+BxOJ85OMb7i/hNx7DRfl9rtr78cuh4HLogj8QQf3 XAJEMbl7oj2scm1Eux0s76sHn+Dgh1RWDsFYmjaUe8oWj7vSxxB8o0gflShufCyB WfRFz9sH0DUKk76ZkcRgPZNTDKML2vakePHgPxMe5DEOLkKXzh6UIa+O2c7CeS0B pl5M7uXG71rZS4ndubcbqvDjrWkP41wxbq3lleCIwODg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=jv4YLn n5Imr0Z0iItgAkac49tzwhiewo3WwnVCSfigI=; b=muqFt8FFEDr7wh7KftoGKD OOTCRwqRjBMT+IMuqMmE/YU2a0j3YRHPQ3scmdx6LJ80l5Mr4toq2gDG1MVGeXO2 sn7pBG+7tFAv7HSbdPxIeYVABgV8J+oxPJyzUXJTT9sb9W9CClOWSh3CKYpF3gUA 2NdiIpMqjdgRuL3S5P/mbdcIefGpt3/AMv6tekKBuizRMk5bUzJ7fiCgTlnbq6ZG U8Rsp53oOWw8QlZvrIP1d4SHkk30B225bLy1huFeTNs4GJo9ig75cWEcf92OoEkv J1IoAoK1LZyDoIpvFiCY3+lVKTauAsTwK3rPZOaNQyPB8VYgIxM7ZBwIcilu+1xQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrtdeggdelkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffujghffgffkfggtgesghdtreertdertdenucfhrhhomhepofgrrhhiuhhs uceurghkkhgvuceomhgsrghkkhgvsehfrghsthhmrghilhdrtghomheqnecukfhppeekge drvddtvddrieekrdejheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgr ihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 8FBF73280060; Thu, 2 Apr 2020 12:44:31 -0400 (EDT) From: Marius Bakke To: John Soo , 40293-done@debbugs.gnu.org Subject: Re: [bug#40293] [PATCH] gnu: cedille: Fix outputs. In-Reply-To: <87wo7444iz.fsf@asu.edu> References: <87wo7444iz.fsf@asu.edu> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Thu, 02 Apr 2020 18:44:30 +0200 Message-ID: <87zhbtrg5t.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40293-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain John Soo writes: > 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! I rewrote the commit message of the second patch to more accurately convey what the patch does in the GNU ChangeLog style. Applied! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6GFm4ACgkQoqBt8qM6 VPqKFggAvSzQMUbr+hyYzNYimWRyGYhLnluiQdWpRGoXWZlRNfxrRu6yiPbqXn3n vg1ajlahion4qFSfFXv7XCPF3Kwvz6QAlHLKqvwTf3CRlZhSWnhGhL8r+ei/Nsf8 FRDg4aHkWQeDjO/6S/SALeFpn1nl3IhdE0gvcEjnYjWJi1rHy8swbninvmp+LrMg 7+zPJLt82uH94i/n02o2ZfKCPKW2iq402KDSTJoMPHxqkkHGV07/HpzjYAgCRJxQ Lcd58t7ui18JoyuKuRFCmlJsiJAFVusskUtUXkTpG4j1kQFE8oTngab+Im/8jsjJ c6pWO5LSrVaRSgexY19U8AvZGYxYvg== =3X4l -----END PGP SIGNATURE----- --=-=-=-- ------------=_1585845902-1788-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 30 Mar 2020 02:35:32 +0000 Received: from lists.gnu.org ([209.51.188.17]:43807) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jIHug-0006nb-5z for submit@debbugs.gnu.org; Sat, 28 Mar 2020 16:18:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52697) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jIHue-0002iu-JF for guix-patches@gnu.org; Sat, 28 Mar 2020 16:18:38 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jIHuc-0006HR-Nn for guix-patches@gnu.org; Sat, 28 Mar 2020 16:18:35 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:45754) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jIHuc-0006G7-8w for guix-patches@gnu.org; Sat, 28 Mar 2020 16:18:34 -0400 Received: by mail-pl1-x62d.google.com with SMTP id b9so4951205pls.12 for ; Sat, 28 Mar 2020 13:18:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version; bh=tMttE5AX7jRLLf6V8zr+Ig87rRHEdkhf8tfvYFWdZJc=; b=AiYrpWufd+MTG5pjyExWsXZeVbsZALd5Cn8KXTcVYK1wd6rEiBvP6uDWeGGkr9tvSC /7hCzTE8hGeM1sK7GxCkbI9u+xrSAYdxybtnjBUhUYlX+W0hi6QKi/EC3MJNFaJGgwLi cQj9vbuZR3djyb1NUYUzD+pQg56ji7cJNm0yUhwfAAD0n4NFZ9uJ6Uw95vSgwUJ0dEG1 09eva5OH8cFkFKi2NFP0o9Hs98wvlBxn2/S6w7E6j3KdgAXksU92hq81oS7mqDWpTiom 5XSow4Rsav0nhPJceWhXWnap1+PU93twxSxrKsKhO9JTI0lLVa2vAB9w4yQP/SoUYzfG i3Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=tMttE5AX7jRLLf6V8zr+Ig87rRHEdkhf8tfvYFWdZJc=; b=Vc4ut/PJSHwrwG1prbvNou+9BBXnB7snzosPZM5tj1doXW67qT+as3o/6zuhltC+Mb lnqngn0wYiCr7bMXebtmaVAA6w6OT1BDNbDLeENyxRWvcnzQqklP4O28dtDQOa+1qYWj 4NwH/+4AtQy9vRbDxzU3LgNDhAjnZC8IjRsTOhUVyt/EDTBWZOINGwGXSvNcjhUQh9ZG CTRva8F54KEpk79tbr1MopADh3sNOjwi9hBBBco1AUhSh5s1gUFQuA9oBn6UkNIR5eDH zLAepKrGRUJ40QqKm2reHFO9jJIWN2VDUOaNNO3EwZpwa0PPQFfn8q+AK6Zi6MTIbgA4 xE4Q== X-Gm-Message-State: ANhLgQ2hpUEbqdJLSIP5Dmw9hEY3fNIbIcJFelDE7VKHJiaXSg+eiMkC Ji8Je7442OayR8rqh4xmobJxZQTip8k= X-Google-Smtp-Source: ADFU+vslnJUYOt2xUS/m816wYUVXu8eRfDoQCXnVnQyNIHsYx5KnEXUBeaEpTLQpz3KOelNsT+BB2g== X-Received: by 2002:a17:90b:d91:: with SMTP id bg17mr6739005pjb.70.1585426712206; Sat, 28 Mar 2020 13:18:32 -0700 (PDT) Received: from ecenter ([2600:1700:83b0:8bd0::6c3]) by smtp.gmail.com with ESMTPSA id s61sm6574927pjd.33.2020.03.28.13.18.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Mar 2020 13:18:31 -0700 (PDT) From: John Soo To: guix-patches@gnu.org Subject: [PATCH] gnu: cedille: Fix outputs. Date: Sat, 28 Mar 2020 13:18:28 -0700 Message-ID: <87wo7444iz.fsf@asu.edu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::62d X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2020 20:18:39 -0000 --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-cedille-Fix-emacs-outputs.patch Content-Description: fix emacs outputs >>From 472597a80f467a78600591c3b83b727e1bdd44a2 Mon Sep 17 00:00:00 2001 From: John Soo 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 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-cedille-Install-the-info-pages.patch Content-Description: add info >>From 45f8563a1d0a32763b43966b214902571ec7c6cb Mon Sep 17 00:00:00 2001 From: John Soo 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 --=-=-=-- ------------=_1585845902-1788-1--