From unknown Sat Aug 16 00:33:17 2025
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.509 (Entity 5.509)
Content-Type: text/plain; charset=utf-8
From: bug#53456 <53456@debbugs.gnu.org>
To: bug#53456 <53456@debbugs.gnu.org>
Subject: Status: [PATCH] gnu: Add fnlfmt.
Reply-To: bug#53456 <53456@debbugs.gnu.org>
Date: Sat, 16 Aug 2025 07:33:17 +0000
retitle 53456 [PATCH] gnu: Add fnlfmt.
reassign 53456 guix-patches
submitter 53456 Brandon Lucas
severity 53456 normal
tag 53456 patch
thanks
From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 16:29:11 2022
Received: (at submit) by debbugs.gnu.org; 22 Jan 2022 21:29:11 +0000
Received: from localhost ([127.0.0.1]:38084 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nBNwd-0007Jy-76
for submit@debbugs.gnu.org; Sat, 22 Jan 2022 16:29:11 -0500
Received: from lists.gnu.org ([209.51.188.17]:60798)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from
) id 1nBNwb-0007Jr-PM
for submit@debbugs.gnu.org; Sat, 22 Jan 2022 16:29:10 -0500
Received: from eggs.gnu.org ([209.51.188.92]:60710)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from
) id 1nBNwb-0002RX-KZ
for guix-patches@gnu.org; Sat, 22 Jan 2022 16:29:09 -0500
Received: from mail-4317.proton.ch ([185.70.43.17]:14572)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from
) id 1nBNwY-0001ok-Er
for guix-patches@gnu.org; Sat, 22 Jan 2022 16:29:09 -0500
Date: Sat, 22 Jan 2022 21:28:56 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ndon.dk;
s=protonmail; t=1642886941;
bh=SXyc/PzCc/xRjq1e6HMKGNsbCvFOwWru0NTefSw5PM8=;
h=Date:To:From:Cc:Reply-To:Subject:Message-ID:From:To:Cc;
b=VQ9izC04W19AVFhv9n/pa8e6bjgCrO3kV4rv8Z/IpoHk/vqkMTj4w6ccJ/FRhq08i
LW/LoMv3DY9PL8z783jlSsxNkJRIhUVAg1Ghmo2/VCuK+HbrM3PJOgDdMryJgnJoU4
G4vl+mAALXGRwVn3gQ6H04DQG2pk3X2DWYawmJF2dqDVZMeUIYQ8Ctupeic8FHfDAn
nphs+Qc3ISE7tGs+WW2PD83h6nS8tGCK0KMKujegU4wQj9rU7Rg/eyr+0NTghbgDmN
mNxSqLu8DxjRN/TXbCl45wEvjnBm3Yg4BzSmi16rQY7GWeSAYQVJ3jkB7fyLCHCfs5
kHFh64VHMeSTQ==
To: guix-patches@gnu.org
From: Brandon Lucas
Subject: [PATCH] gnu: Add fnlfmt.
Message-ID: <20220122212723.396566-1-br@ndon.dk>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no
autolearn=disabled version=3.4.4
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on
mailout.protonmail.ch
Received-SPF: pass client-ip=185.70.43.17; envelope-from=br@ndon.dk;
helo=mail-4317.proton.ch
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
Cc: Brandon Lucas
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: ,
Reply-To: Brandon Lucas
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit"
X-Spam-Score: -2.3 (--)
* gnu/packages/lua.scm (fnlfmt): New variable.
---
gnu/packages/lua.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 99f09a26f1..50f97c3912 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -15,6 +15,7 @@
;;; Copyright =C2=A9 2020 Paul A. Patience
;;; Copyright =C2=A9 2021 Vin=C3=ADcius dos Santos Oliveira
;;; Copyright =C2=A9 2021 Greg Hogan
+;;; Copyright =C2=A9 2022 Brandon Lucas
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1208,3 +1209,48 @@ (define-public fennel
simplicity, and reach of Lua with the flexibility of a Lisp syntax and mac=
ro
system.")
(license license:expat)))
+
+(define-public fnlfmt
+ (package
+ (name "fnlfmt")
+ (version "0.2.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~technomancy/fnlfmt")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1rv0amqhy5ypi3pvxfaadn3k1cy4mjlc49wdzl2psz3i11w9gr36"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:test-target "test"
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'patch-makefile
+ ;; Use input fennel instead of bundled fennel.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "Makefile"
+ (("./fennel") (search-input-file inputs "/bin/fennel")))))
+ (add-after 'build 'patch-fnlfmt
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "fnlfmt"
+ (("/usr/bin/env .*lua") (search-input-file inputs "/bin/lua=
")))))
+ (replace 'install
+ ;; There is no install target; manually install the output file=
.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")) (bin (string-append ou=
t
+ "/bin")))
+ (for-each (lambda (file)
+ (install-file file bin))
+ (find-files "." "fnlfmt"))))))))
+ (inputs (list fennel))
+ (propagated-inputs (list lua))
+ (home-page "https://git.sr.ht/~technomancy/fnlfmt")
+ (synopsis "Automatic formatting of Fennel code")
+ (description
+ "Fnlfmt is a tool for automatically formatting Fennel code in a consi=
stent
+way, following established lisp conventions.")
+ (license license:lgpl3+)))
--
2.34.0
From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 16:33:52 2022
Received: (at 53456) by debbugs.gnu.org; 22 Jan 2022 21:33:52 +0000
Received: from localhost ([127.0.0.1]:38097 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nBO1A-0007T4-3W
for submit@debbugs.gnu.org; Sat, 22 Jan 2022 16:33:52 -0500
Received: from albert.telenet-ops.be ([195.130.137.90]:60834)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from ) id 1nBO18-0007Sv-Ir
for 53456@debbugs.gnu.org; Sat, 22 Jan 2022 16:33:51 -0500
Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a])
by albert.telenet-ops.be with bizsmtp
id lxZo260104UW6Th06xZpMc; Sat, 22 Jan 2022 22:33:49 +0100
Message-ID:
Subject: Re: [bug#53456] [PATCH] gnu: Add fnlfmt.
From: Maxime Devos
To: Brandon Lucas
, 53456@debbugs.gnu.org
Date: Sat, 22 Jan 2022 22:33:48 +0100
In-Reply-To: <20220122212723.396566-1-br@ndon.dk>
References: <20220122212723.396566-1-br@ndon.dk>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-XqV7BRh/ylDxAxYJikXs"
User-Agent: Evolution 3.38.3-1
MIME-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1642887229; bh=VKplY+WJl2sXAIHKC7RtXxcXiNrgNvikSFPRy08BgVc=;
h=Subject:From:To:Date:In-Reply-To:References;
b=RaXwJskr8W++eWVxC3G9XIAa4xaOuTYHWbCQuP/HcbK33M6TMcrLt0idzWPR4zZfx
omYXGV5katywN0+EKeY9nBfkgBgwjlrhaRtDl/T5QAaWc9h+Jd8NWXC5qylsu3Mkul
0NP0r8aaDU+H2NERWkT1zvVNfb2YYSzg8WTVMh5+S8jYJo3XKQBQZVoxSiVlMu/C7K
etJGytHFzRKijHnET549cNWBg1rcDIs91L8o7yewMhBERHGxjwq8xqx88Dn0gvnEYn
4Sb7ZVv3wqK02HwO2nttHQNZ3cSdW4GPfA0wC+jPLU+M59h4xJytDveFwmyOKD4lWz
DHCAbz4+g+LQQ==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 53456
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 (-)
--=-XqV7BRh/ylDxAxYJikXs
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Brandon Lucas schreef op za 22-01-2022 om 21:28 [+0000]:
> + (add-after 'build 'patch-fnlfmt
> + (lambda* (#:key inputs #:allow-other-keys)
> + (substitute* "fnlfmt"
> + (("/usr/bin/env .*lua") (search-input-file inputs
> "/bin/lua")))))
> + (inputs (list fennel))
> + (propagated-inputs (list lua))
Given that the shebang in 'fnlfmt' has been patched appropriately, what
is the point of propagating here? Can lua be moved to 'inputs'?
Greetings,
Maxime
--=-XqV7BRh/ylDxAxYJikXs
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYex4PBccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7lMpAP99cEItetY+UwUP6MoNYFPfDLzS
cfRPs+ddim0SWGsRtgD/SKmoGbKQk1uvmqAEtCtD+Qv3sEODetj3ENtfC5OtmAI=
=13Dy
-----END PGP SIGNATURE-----
--=-XqV7BRh/ylDxAxYJikXs--
From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 16:39:58 2022
Received: (at 53456) by debbugs.gnu.org; 22 Jan 2022 21:39:58 +0000
Received: from localhost ([127.0.0.1]:38113 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nBO74-0007dM-IB
for submit@debbugs.gnu.org; Sat, 22 Jan 2022 16:39:58 -0500
Received: from michel.telenet-ops.be ([195.130.137.88]:34840)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from ) id 1nBO72-0007dB-LH
for 53456@debbugs.gnu.org; Sat, 22 Jan 2022 16:39:57 -0500
Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a])
by michel.telenet-ops.be with bizsmtp
id lxfu2600H4UW6Th06xfuY5; Sat, 22 Jan 2022 22:39:55 +0100
Message-ID:
Subject: Re: [bug#53456] [PATCH] gnu: Add fnlfmt.
From: Maxime Devos
To: Brandon Lucas
, 53456@debbugs.gnu.org
Date: Sat, 22 Jan 2022 22:39:54 +0100
In-Reply-To: <20220122212723.396566-1-br@ndon.dk>
References: <20220122212723.396566-1-br@ndon.dk>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-ndUtOaVXORtMOtcQcX4C"
User-Agent: Evolution 3.38.3-1
MIME-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1642887595; bh=8MBU85KYZ4NaS9iUuoFnlnkAuOD4960WlWYvneLC7V8=;
h=Subject:From:To:Date:In-Reply-To:References;
b=Rx7fDS2lNLGDfaYZE/pU1SL5FTCA2znsyRj3XV9KZu5WtVxQlFMS7ivr+0IJKbdy4
CU3lbrRvFA381WUHvM0crchnH8sK+rOZB97ZEpVwnNWkQn6cw+4ixoJZcdR+kmgJVv
zngbwNd6y+UoU2OZQ3ycUak89Qn5yDao66Sic7HkIaw5sA49XBsH6cOGD10qF/guEI
JGcfCVNcenHHupoR6Uladxk1vtZFMgfiyJ0Z2zLaLA+mXQbOV2Nk44m2JNRpBeq0L7
jrPxmnjg/i6fk54tooU1wHIeA9RtAoN7jXRF1BpxuFZh0F/b9YhCK18pUn8HgrS/ZT
rzwXumlq4AszQ==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 53456
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 (-)
--=-ndUtOaVXORtMOtcQcX4C
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Brandon Lucas schreef op za 22-01-2022 om 21:28 [+0000]:
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;; Use inpu=
t fennel instead of bundled fennel.
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (lambda* (#=
:key inputs #:allow-other-keys)
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
(substitute* "Makefile"
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 (("./fennel") (search-input-file inputs "/bin/fennel")))))
'fennel' is in native-inputs, not inputs. For historical reasons,
the 'inputs' in the phase contains both the native-inputs and native-
inputs in the phase is #false when compiling natively, which can be
confusing (maybe that can be addressed someday).
I suggest:
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(substitute* "Makefile"
(("./fennel")
(search-input-file (or native-inputs inputs) "/bin/fennel")))))
--=-ndUtOaVXORtMOtcQcX4C
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYex5qhccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7tbNAQDsWoCHjOTGaKCNE7Wpb48QGmjg
OJGNZ8+AMxiESuwb4QEAiqlXpHVcjYxxQ54jQ35S4qMeQMOopUIa/G5QEFkShQE=
=+EyK
-----END PGP SIGNATURE-----
--=-ndUtOaVXORtMOtcQcX4C--
From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 16:41:20 2022
Received: (at 53456) by debbugs.gnu.org; 22 Jan 2022 21:41:20 +0000
Received: from localhost ([127.0.0.1]:38125 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nBO8O-0007gr-2Q
for submit@debbugs.gnu.org; Sat, 22 Jan 2022 16:41:20 -0500
Received: from michel.telenet-ops.be ([195.130.137.88]:35800)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from ) id 1nBO8M-0007gj-KK
for 53456@debbugs.gnu.org; Sat, 22 Jan 2022 16:41:19 -0500
Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a])
by michel.telenet-ops.be with bizsmtp
id lxhH2601C4UW6Th06xhHbd; Sat, 22 Jan 2022 22:41:17 +0100
Message-ID: <34a56a4c15309189884b660d737d10f4898e8200.camel@telenet.be>
Subject: Re: [bug#53456] [PATCH] gnu: Add fnlfmt.
From: Maxime Devos
To: Brandon Lucas
, 53456@debbugs.gnu.org
Date: Sat, 22 Jan 2022 22:41:17 +0100
In-Reply-To: <20220122212723.396566-1-br@ndon.dk>
References: <20220122212723.396566-1-br@ndon.dk>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.38.3-1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1642887678; bh=J45E5rqeNuQL/CofRorkl4n0iILJGlM3AYYfeMmfpx0=;
h=Subject:From:To:Date:In-Reply-To:References;
b=D+DMm0EjMS3mxLiLdFgQZITQhmVqkNk57afDL8JUQJVed40WnX8RF+sCEZVxdziq0
Ac83uM1PqrkWgv5+f15NvxwJ29GmITTAobuvPbcJ/g4toCPnW5K06daTXJz4CBSitc
OWBcrFBekc9FmMFHsSGIsQfj0HeBIUpljnHCOY6+vAMFLPV86bGsVe6HO7uX+FGWh5
eJ/epy2JpXVT+Ziz4q3Jze7ajDoAiFVapMqvzBGyq5zQ2usK2dRUrsGvBm7lCZT6/J
zahx56g/W41Y/MbBCwoFBDY+mlYaaR3bqojupJPUXJGQnFKAMztlJNQKFx/Zy6p6TZ
5u1kRPd1aABxw==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 53456
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 (-)
Brandon Lucas schreef op za 22-01-2022 om 21:28 [+0000]:
> + (add-after 'build 'patch-fnlfmt
> + (lambda* (#:key inputs #:allow-other-keys)
> + (substitute* "fnlfmt"
> + (("/usr/bin/env .*lua") (search-input-file inputs "/bin/lua")))))
I think modifying the Makefile (in patch-makefile) to replace the
/usr/bin/env lua there would be a little simpler.
From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 16:43:20 2022
Received: (at 53456) by debbugs.gnu.org; 22 Jan 2022 21:43:20 +0000
Received: from localhost ([127.0.0.1]:38130 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nBOAK-0007jv-CP
for submit@debbugs.gnu.org; Sat, 22 Jan 2022 16:43:20 -0500
Received: from albert.telenet-ops.be ([195.130.137.90]:39354)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from ) id 1nBOAG-0007jk-LG
for 53456@debbugs.gnu.org; Sat, 22 Jan 2022 16:43:18 -0500
Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a])
by albert.telenet-ops.be with bizsmtp
id lxjF2600A4UW6Th06xjFwR; Sat, 22 Jan 2022 22:43:15 +0100
Message-ID: <4a5b129ce0c76476160d540261d0cd1307a63362.camel@telenet.be>
Subject: Re: [bug#53456] [PATCH] gnu: Add fnlfmt.
From: Maxime Devos
To: Brandon Lucas
, 53456@debbugs.gnu.org
Date: Sat, 22 Jan 2022 22:43:15 +0100
In-Reply-To: <20220122212723.396566-1-br@ndon.dk>
References: <20220122212723.396566-1-br@ndon.dk>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.38.3-1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1642887795; bh=H43zRbPBIrVYa21/Ee1Ysxb606Mpd7E8pYAWpaJFc04=;
h=Subject:From:To:Date:In-Reply-To:References;
b=QEjTeABidXssMu6EbX6UKyDAdZye7aShCusUNSImYmMr1IhuWcSwfKAir82AZnXyr
kOrAcB0Bm+6qZCfms3nb9CbJEBLoJuY2jPbgFCX1snHzh6nZ2Pys4sHNJ9As+dlHYo
Y/aHOAwLxAA4nwU+ZArMc1pOOccFq4+1wjI0gEKX1mDNFXOAczooFXiBXOmJTLM4ry
kAzXr3Ph+8ysWMF91ALWHXEttu+pKdXVZXbKtUM2VYHA4HVnBZhh36+oA2sdTiQljO
HSjvw/kfLSV0KWxcIgSUd3yoCkB386H9E/CdEZfIhRuCxmdIZax2v2wO816YssYCU5
bNVywvQwW1qyg==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 53456
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 (-)
Brandon Lucas schreef op za 22-01-2022 om 21:28 [+0000]:
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://git.sr.ht/~technomancy/fnlfmt")
> + (commit version)))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> + "1rv0amqhy5ypi3pvxfaadn3k1cy4mjlc49wdzl2psz3i11w9gr36"))))
> + (build-system gnu-build-system)
> + (arguments
> + '(#:test-target "test"
> + #:phases
> + (modify-phases %standard-phases
> + (delete 'configure)
> + (add-before 'build 'patch-makefile
> + ;; Use input fennel instead of bundled fennel.
> + (lambda* (#:key inputs #:allow-other-keys)
> + (substitute* "Makefile"
> + (("./fennel") (search-input-file inputs "/bin/fennel")))))
Unbundling is conventionally done using an origin snippet.
See ‘17.4.5 Snippets versus Phases’ in the manual.
From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 16:46:14 2022
Received: (at 53456) by debbugs.gnu.org; 22 Jan 2022 21:46:14 +0000
Received: from localhost ([127.0.0.1]:38143 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nBOD8-0007pX-8O
for submit@debbugs.gnu.org; Sat, 22 Jan 2022 16:46:14 -0500
Received: from michel.telenet-ops.be ([195.130.137.88]:39438)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from ) id 1nBOD7-0007pQ-7w
for 53456@debbugs.gnu.org; Sat, 22 Jan 2022 16:46:13 -0500
Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a])
by michel.telenet-ops.be with bizsmtp
id lxmC260034UW6Th06xmCwo; Sat, 22 Jan 2022 22:46:12 +0100
Message-ID:
Subject: Re: [bug#53456] [PATCH] gnu: Add fnlfmt.
From: Maxime Devos
To: Brandon Lucas
, 53456@debbugs.gnu.org
Date: Sat, 22 Jan 2022 22:46:11 +0100
In-Reply-To: <20220122212723.396566-1-br@ndon.dk>
References: <20220122212723.396566-1-br@ndon.dk>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-+/Tiy6tk0hJLtSHJg6eS"
User-Agent: Evolution 3.38.3-1
MIME-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1642887972; bh=XinBjKFP4LceRdeOsn4F/q77BvSiWcI1d7Lb5td4pUs=;
h=Subject:From:To:Date:In-Reply-To:References;
b=U6Su7J9NMehR3DByJLCjepjL8j8bntTuijTvVoDLuy7y0wkxeWbDTClVPHss59O/S
r2RyOhaIQKxrotHxqGvi+GYglSKaHzSXSUKmoSeofTB7bwUMsLO5cOtYgKPmXUSXQg
m6shXzss/U3Pkg8jMpt663EtRkgfJlKi2v0LrUvoddfJywHNug591FEsY38fFDggnf
mLrjIGBhW+3oW6W8GqiIegooO7uBYRWph2+LbxaFPHNIoQu3cfuWndLnHTGQGbRcNY
CyM12XpAC0RChf6buHlaRNeeOgHqs2YPw+SWA+x6lNSiORBHVMiW/9Ot3Gr8joo6gE
/3DulhJ9K6wxA==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 53456
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 (-)
--=-+/Tiy6tk0hJLtSHJg6eS
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Brandon Lucas schreef op za 22-01-2022 om 21:28 [+0000]:
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (url "https://git.sr.ht/~technom=
ancy/fnlfmt")
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (commit version)))
Upstream appears to be violating the Expat license of the bundled
'fennel' by not including a copy of the Expat license:
[...], subject to the following conditions:
The above copyright notice and this permission notice shall be
included in all copies of substantial portions of the Software.
[...]
Can this be adddressed (upstream)?
Greetings,
Maxime.
--=-+/Tiy6tk0hJLtSHJg6eS
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYex7IxccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7qdlAQCa1MBxDJjDTX44/CY25wOxGWQ2
pYSFSpECToYlJU+b3gD+PUcw13dp9cD5zGHO8wkTlSMh/Tvzir57ONXaogUp+gY=
=TVQk
-----END PGP SIGNATURE-----
--=-+/Tiy6tk0hJLtSHJg6eS--
From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 16:53:34 2022
Received: (at 53456) by debbugs.gnu.org; 22 Jan 2022 21:53:34 +0000
Received: from localhost ([127.0.0.1]:38148 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nBOKE-00081j-04
for submit@debbugs.gnu.org; Sat, 22 Jan 2022 16:53:34 -0500
Received: from michel.telenet-ops.be ([195.130.137.88]:44766)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from ) id 1nBOKB-00081Y-Hm
for 53456@debbugs.gnu.org; Sat, 22 Jan 2022 16:53:32 -0500
Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a])
by michel.telenet-ops.be with bizsmtp
id lxtW260034UW6Th06xtWRZ; Sat, 22 Jan 2022 22:53:30 +0100
Message-ID: <617c5d3165f9c1693809c2ab3b0c49843f083369.camel@telenet.be>
Subject: Re: [bug#53456] [PATCH] gnu: Add fnlfmt.
From: Maxime Devos
To: Brandon Lucas
, 53456@debbugs.gnu.org
Date: Sat, 22 Jan 2022 22:53:29 +0100
In-Reply-To: <20220122212723.396566-1-br@ndon.dk>
References: <20220122212723.396566-1-br@ndon.dk>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-nwCLYTO0VjO5/CEwLE98"
User-Agent: Evolution 3.38.3-1
MIME-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1642888410; bh=VmUJhIN7oN+XynaJknT6Uo9WdRjLW/bMAAMEQgGCV+A=;
h=Subject:From:To:Date:In-Reply-To:References;
b=CPYhfm9m4mqPF5es8mIXQhj8CLw8YacPgobFNcolEfUQ2ReSudnQX35zMeiJ76Ofb
QfGy2onhZqEnhmR5pWKwaXFuQt287pt1oYguGm08Gw9JGytZf99RPGe8wYfUhYBCgs
62udFRaAyI9Omxt9ju191Y7AgxK1HlNlIDENeta6JtTYjVlqOSqmfFsYmLV/Cn92L/
G5mHR/Ahupu3v7fPfADuj+x7QR6Np/vj9R4AZUEOagme78G+qkUGCOdUOM7o3K8EQV
FY2/4LmLTVRKg9TQPusX1huH282mWCcqdiruyES9a8fqhrIzEv003qidXvDZO4qC2I
7ibsDtK/ipKcw==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 53456
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 (-)
--=-nwCLYTO0VjO5/CEwLE98
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Brandon Lucas schreef op za 22-01-2022 om 21:28 [+0000]:
> +=C2=A0=C2=A0=C2=A0 (license license:lgpl3+)))
The lgpl3+ is by itself not a complete license, it is structured as a
few exceptions under conditions to the gpl. The lgpl3 even asks you to
include both a copy of the GPL3 and the LGPL3 license text:
https://git.sr.ht/~technomancy/fnlfmt/tree/main/item/LICENSE#L91
b) Accompany the Combined Work with a copy of the GNU GPL and this
license document.
Strictly speaking that's only for =E2=80=98Combined works=E2=80=99, and I d=
on't expect
any trouble in practice. However, it would be nice to do things
properly. Would you be up to asking upstream to include a copy of the
GPL as well (which upstream isn't doing currently)?
Greetings,
Maxime.
--=-nwCLYTO0VjO5/CEwLE98
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYex82RccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7lL0AP9Io5uVr/Ae+ILtAasJDSgw6wU6
CB9ei8O/GFLHq0dBOwEApIXW0XL7aSGFEyhk5C3jYRpfKn/LrSLhu0v/gpnYFQc=
=OE+O
-----END PGP SIGNATURE-----
--=-nwCLYTO0VjO5/CEwLE98--
From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 19:16:25 2022
Received: (at 53456) by debbugs.gnu.org; 23 Jan 2022 00:16:25 +0000
Received: from localhost ([127.0.0.1]:38204 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nBQYT-000357-13
for submit@debbugs.gnu.org; Sat, 22 Jan 2022 19:16:25 -0500
Received: from mail-4018.proton.ch ([185.70.40.18]:16965)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from
) id 1nBQYP-00034q-24
for 53456@debbugs.gnu.org; Sat, 22 Jan 2022 19:16:23 -0500
Date: Sun, 23 Jan 2022 00:16:07 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ndon.dk;
s=protonmail; t=1642896973;
bh=L5ubtRpUtvTvTqV5TRPXD8UWvxEbNXlzUkrQMKoePOY=;
h=Date:To:From:Cc:Reply-To:Subject:Message-ID:From:To:Cc;
b=wm8TDiDRQJDNlP+nFfICD8kOtKG7lxlRa7wqThpBCTjPu0FeJM9L6OHZPvVA+jPt+
d+YPWX7S1y4NmYSRsmxOVo9DSRXFg7mb2rpyixG7/bh8USmkMWaR4YL/1Yh2w+9ICQ
r6r2H6lSxg6Z3QA1WLz9Xbm97eQdiNQj9gWSaDBkZcwvd1rSOuEyXt+LxeXNAU7lCb
TDWT7vh6AFD37WC6sPJjk6rYGdhu//tH193Zpy4E2sv2012dN7aZSTE1CQU7NF8u5M
xLz5C8UVB818JaagfaofaM4WgBS8l2b2cstN58Mte6qPMHbNeBDUaYsplWnYZqV2f5
U4rRPUETDz+9Q==
To: 53456@debbugs.gnu.org
From: Brandon Lucas
Subject: [PATCH v2 1/2] gnu: Add fnlfmt.
Message-ID: <20220123001509.484504-1-br@ndon.dk>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no
autolearn=disabled version=3.4.4
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on
mailout.protonmail.ch
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 53456
Cc: Brandon Lucas
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: ,
Reply-To: Brandon Lucas
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit"
X-Spam-Score: -1.0 (-)
* gnu/packages/lua.scm (fnlfmt): New variable.
---
Thank you for the review. I learned a lot. :)
I also realized that if I truly unbundle fennel from fnlfmt, I also need
to wrap it, so that it can load fennel at runtime. It only worked before
because I had failed to remove the fennel.lua file from the checkout.
I have tried to apply your other suggestions here as well.
I will also write to upstream and attempt to get the licensing
clarified.
gnu/packages/lua.scm | 65 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 99f09a26f1..1543d7bd11 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -15,6 +15,7 @@
;;; Copyright =C2=A9 2020 Paul A. Patience
;;; Copyright =C2=A9 2021 Vin=C3=ADcius dos Santos Oliveira
;;; Copyright =C2=A9 2021 Greg Hogan
+;;; Copyright =C2=A9 2022 Brandon Lucas
;;;
;;; This file is part of GNU Guix.
;;;
@@ -36,12 +37,14 @@ (define-module (gnu packages lua)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
#:use-module (guix build-system meson)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages glib)
@@ -1208,3 +1211,65 @@ (define-public fennel
simplicity, and reach of Lua with the flexibility of a Lisp syntax and mac=
ro
system.")
(license license:expat)))
+
+(define-public fnlfmt
+ (package
+ (name "fnlfmt")
+ (version "0.2.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~technomancy/fnlfmt")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1rv0amqhy5ypi3pvxfaadn3k1cy4mjlc49wdzl2psz3i11w9gr36"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; Use input fennel instead of bundled fennel.
+ (delete-file-recursively "fennel")
+ (delete-file-recursively "fennel.lua")
+ (substitute* "Makefile"
+ (("./fennel") "fennel"))))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:modules ((guix build gnu-build-system)
+ (guix build utils)
+ (ice-9 match))
+ #:test-target "test"
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'patch-makefile
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (substitute* "Makefile"
+ ;; Patch lua shebang that gets inserted to fnlfmt.
+ (("/usr/bin/env lua")
+ (search-input-file (or native-inputs inputs) "/bin/lua")))))
+ (replace 'install
+ ;; There is no install target; manually install the output file.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin")))
+ (for-each (lambda (file)
+ (install-file file bin))
+ (find-files "." "fnlfmt")))))
+ (add-after 'install 'wrap
+ (lambda* (#:key inputs native-inputs outputs #:allow-other-keys)
+ (let* ((all-inputs (or native-inputs inputs))
+ (fnlfmt (assoc-ref outputs "out"))
+ (lua-version ,(version-major+minor (package-version lua))=
)
+ (fennel (assoc-ref all-inputs "fennel")))
+ (wrap-program (string-append fnlfmt "/bin/fnlfmt")
+ `("LUA_PATH" ";" suffix
+ (,(format #f "~a/share/lua/~a/?.lua" fennel lua-version))))
+ #t))))))
+ (inputs (list bash-minimal lua fennel))
+ (home-page "https://git.sr.ht/~technomancy/fnlfmt")
+ (synopsis "Automatic formatting of Fennel code")
+ (description
+ "Fnlfmt is a tool for automatically formatting Fennel code in a consi=
stent
+way, following established lisp conventions.")
+ (license license:lgpl3+)))
--
2.34.0
From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 22 19:19:37 2022
Received: (at 53456) by debbugs.gnu.org; 23 Jan 2022 00:19:37 +0000
Received: from localhost ([127.0.0.1]:38210 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nBQbY-00039j-KL
for submit@debbugs.gnu.org; Sat, 22 Jan 2022 19:19:36 -0500
Received: from mail-4317.proton.ch ([185.70.43.17]:64999)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from
) id 1nBQbW-00039V-Fd
for 53456@debbugs.gnu.org; Sat, 22 Jan 2022 19:19:35 -0500
Date: Sun, 23 Jan 2022 00:19:20 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ndon.dk;
s=protonmail; t=1642897167;
bh=y/pfLOVxlppjesNltX6LMY21elURE7AUWfpHwgKmaKg=;
h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To:
References:From:To:Cc;
b=yXrfcLvDzVbSrB2IpzHkVCDHVwIc9shEzWI7lupeL1aQ6mpXMgPdQwTQf+yF4qP/h
PCG1tU3v5oz2tzboUUSXBk3ACbXN56RcM/yxeUEAiWwNZBiw+AQZ/lzOin8Z0Y57/a
HxzxwUVIdHGSDKv2kVFInhLF9hSegHm56akTKgB5KKW+JtP8cx77hlDx14gZV9dTpZ
gvEkGxqkKgnPVetSiXHHXtGGqs4HvNB8USyWWafW03ik68aeX3BJs5jN7vxEbsG4Bp
zF0ZbrfsbtZEN8LQCx/nLomy2SdXeI3IBl2mfkIgHCQqhUhZD4lHP4d/qlNUHmlKs7
+2d5oSe87oJ5w==
To: 53456@debbugs.gnu.org
From: Brandon Lucas
Subject: [PATCH v2 2/2] gnu: fennel: Update to 03c1c95.
Message-ID: <20220123001509.484504-2-br@ndon.dk>
In-Reply-To: <20220123001509.484504-1-br@ndon.dk>
References: <20220123001509.484504-1-br@ndon.dk>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no
autolearn=disabled version=3.4.4
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on
mailout.protonmail.ch
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 53456
Cc: Brandon Lucas
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: ,
Reply-To: Brandon Lucas
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit"
X-Spam-Score: -1.0 (-)
* gnu/packages/lua.scm (fennel): Update to 03c1c95.
---
In order to properly wrap fnlfmt with LUA_PATH to fennel, we need to
know which /share/lua/x.x dir fennel got installed under.
The 1.0.0 release had a bug where fennel installed under 5.4 no matter
what lua was used to compile it. There has since been an update that
corrects this issue, so we can rely on the version of the lua input to
determine where the fennel.lua file got installed to.
gnu/packages/lua.scm | 66 +++++++++++++++++++++++---------------------
1 file changed, 34 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 1543d7bd11..568505a457 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -1175,42 +1175,44 @@ (define-public emilua
(license license:boost1.0)))
(define-public fennel
- (package
- (name "fennel")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.sr.ht/~technomancy/fennel")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0d4rpf0f2aqxlca3kxrbhjjhf1knhiz8ccwlx8xid05mc16la70y"))))
- (build-system gnu-build-system)
- (arguments
- '(#:make-flags (list (string-append "PREFIX=3D" (assoc-ref %outputs "=
out")))
- #:tests? #t ; even on cross-build
- #:test-target "test"
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-after 'build 'patch-fennel
+ (let ((commit "03c1c95f2a79e45a9baf607f96a74c693b8b70f4")
+ (revision "0"))
+ (package
+ (name "fennel")
+ (version (git-version "1.0.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~technomancy/fennel")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1znp38h5q819gvcyl248zwvjsljfxdxdk8n82fnj6lyibiiqzgvx"))=
))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:make-flags (list (string-append "PREFIX=3D" (assoc-ref %outputs=
"out")))
+ #:tests? #t ; even on cross-build
+ #:test-target "test"
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'build 'patch-fennel
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "fennel"
- (("/usr/bin/env .*lua")
- (search-input-file inputs "/bin/lua")))))
- (delete 'check)
- (add-after 'install 'check
+ (substitute* "fennel"
+ (("/usr/bin/env .*lua")
+ (search-input-file inputs "/bin/lua")))))
+ (delete 'check)
+ (add-after 'install 'check
(assoc-ref %standard-phases 'check)))))
- (inputs (list lua))
- (home-page "https://fennel-lang.org/")
- (synopsis "Lisp that compiles to Lua")
- (description
- "Fennel is a programming language that brings together the speed,
+ (inputs (list lua))
+ (home-page "https://fennel-lang.org/")
+ (synopsis "Lisp that compiles to Lua")
+ (description
+ "Fennel is a programming language that brings together the speed,
simplicity, and reach of Lua with the flexibility of a Lisp syntax and mac=
ro
system.")
- (license license:expat)))
+ (license license:expat))))
(define-public fnlfmt
(package
--
2.34.0
From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 23 06:05:16 2022
Received: (at 53456) by debbugs.gnu.org; 23 Jan 2022 11:05:16 +0000
Received: from localhost ([127.0.0.1]:38636 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nBagO-0005CS-Bv
for submit@debbugs.gnu.org; Sun, 23 Jan 2022 06:05:16 -0500
Received: from andre.telenet-ops.be ([195.130.132.53]:45294)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from ) id 1nBagN-0005CK-9J
for 53456@debbugs.gnu.org; Sun, 23 Jan 2022 06:05:15 -0500
Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a])
by andre.telenet-ops.be with bizsmtp
id mB5D2600G4UW6Th01B5EPP; Sun, 23 Jan 2022 12:05:14 +0100
Message-ID: <10b95bc32c2b1d34bd6fa487f745ff6ef5660863.camel@telenet.be>
Subject: Re: [bug#53456] [PATCH v2 1/2] gnu: Add fnlfmt.
From: Maxime Devos
To: Brandon Lucas
, 53456@debbugs.gnu.org
Date: Sun, 23 Jan 2022 12:05:13 +0100
In-Reply-To: <20220123001509.484504-1-br@ndon.dk>
References: <20220122212723.396566-1-br@ndon.dk>
<20220123001509.484504-1-br@ndon.dk>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-TTAbpn5TacBgLy9PujBV"
User-Agent: Evolution 3.38.3-1
MIME-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1642935914; bh=QhrB8kGEngzvPouK5XuG/n+w3fy8UuMKOwJBeSTUFg8=;
h=Subject:From:To:Date:In-Reply-To:References;
b=OsNkCRjPxECpIIHyCy5S52w6A5Joyubu00v/wHGinw+bpOihtSvLz87iQ2fk1YoX9
U8hE9WvgrpNJEPHF9MYYNw9YBkdHmNVG0JH6Yh0422N8YKYLxhP6/flfn8lOmVltWm
hTaGkvsHSS0bBAMeX03GMJ4SxqdMx2VSsAQDKgGRftsVtsyif1S0rmC1IOWd659fyk
yvVpcXqPOHjBi1GX8Z3GGfKOZUgtPsdDcZIxZlIB32yfQUWgl/+vistPVyuQazhal/
jRLnGqYox2CD5GLumVEHPR0UeVsYy77E+ZAunh8hSd7kULBBQ8DEGnDUV7DxVJtf0B
dwHjooPybRj+g==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 53456
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 (-)
--=-TTAbpn5TacBgLy9PujBV
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: base64
QnJhbmRvbiBMdWNhcyBzY2hyZWVmIG9wIHpvIDIzLTAxLTIwMjIgb20gMDA6MTYgWyswMDAwXToK
PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChkZWxldGUtZmlsZS1yZWN1
cnNpdmVseSAiZmVubmVsIikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg
IChkZWxldGUtZmlsZS1yZWN1cnNpdmVseSAiZmVubmVsLmx1YSIpCgpUaGlzIGlzIG5vdCB3cm9u
ZywgYnV0ICdmZW5uZWwnIGFuZCAnZmVubmVsLmx1YScgYXJlIHJlZ3VsYXIgZmlsZXMgYW5kCm5v
dCBkaXJlY3Rvcmllcywgc28gKGRlbGV0ZS1maWxlICJmZW5uZWwiKSAoZGVsZXRlLWZpbGUgImZl
bm5lbC5sdWEiKQp3b3VsZCBiZSBzdWZmaWNpZW50LgoK
--=-TTAbpn5TacBgLy9PujBV
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYe02aRccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7vbZAP9OTfzqdr0noM/5PVkltPZ1AFIZ
6Q0SXQoNeyfIqGD9QgD/WcT4H6sFGu3sg9HeaDQOeoOWulftJ4NURpCtyistOwg=
=f7hb
-----END PGP SIGNATURE-----
--=-TTAbpn5TacBgLy9PujBV--
From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 23 06:11:48 2022
Received: (at 53456) by debbugs.gnu.org; 23 Jan 2022 11:11:48 +0000
Received: from localhost ([127.0.0.1]:38647 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nBami-0005Li-5q
for submit@debbugs.gnu.org; Sun, 23 Jan 2022 06:11:48 -0500
Received: from andre.telenet-ops.be ([195.130.132.53]:52864)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from ) id 1nBamg-0005LY-Dq
for 53456@debbugs.gnu.org; Sun, 23 Jan 2022 06:11:47 -0500
Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be
([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a])
by andre.telenet-ops.be with bizsmtp
id mBBl260064UW6Th01BBl6P; Sun, 23 Jan 2022 12:11:45 +0100
Message-ID:
Subject: Re: [bug#53456] [PATCH v2 1/2] gnu: Add fnlfmt.
From: Maxime Devos
To: Brandon Lucas
, 53456@debbugs.gnu.org
Date: Sun, 23 Jan 2022 12:11:44 +0100
In-Reply-To: <20220123001509.484504-1-br@ndon.dk>
References: <20220122212723.396566-1-br@ndon.dk>
<20220123001509.484504-1-br@ndon.dk>
Content-Type: multipart/signed; micalg="pgp-sha512";
protocol="application/pgp-signature"; boundary="=-VW/vTfYhnIF5WaLkkFmB"
User-Agent: Evolution 3.38.3-1
MIME-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22;
t=1642936305; bh=gu9n1WlTKRLyf/YGjHGjhBUMFciptqp+1lJBvT/hn5w=;
h=Subject:From:To:Date:In-Reply-To:References;
b=Z/8b6JQn7ckM3h3jYzyvywVSjF6/PSB4hSuXgJxcyqdMPSiI0TIPULg8P5BxJPddn
MQCaKSCHLrBsyPd0Z95QyiRyUFGhQLIWdfXVnYmOPAUef7ZHGhpjVi3+ZWD3hc1VCg
xmChs84ZlWiYNMDQ2dIBVYV0Fwz6wgqm+4fk9izus3wWx1wP44iEQWDjLb49qykH/L
E8J3nX03dAOG7NAp8mlZ/NQiobV7DkAtBbcWuV7bV8/f4PzQKS/+bfr+IZEQY6a71A
XIpxi3QUC+9XSMe29LXOTFpSfTZxS+4EkmjRP0z4C5kcTOeGUJ11I3/DG9DOWkvijj
NcECm1HcCUsRA==
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 53456
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 (-)
--=-VW/vTfYhnIF5WaLkkFmB
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Brandon Lucas schreef op zo 23-01-2022 om 00:16 [+0000]:
> +=C2=A0=C2=A0=C2=A0 (inputs (list bash-minimal lua fennel))
'fennel' is used as a tool run during building
(https://git.sr.ht/~technomancy/fnlfmt/tree/main/item/Makefile#L3),
so it needs to be in native-inputs. It is also used as a kind of
library (see LUA_PATH in 'wrap' phase), so it needs to be in
native-inputs as well.
Summarised: 'fennel' needs to be in both inputs and native-inputs.
As a test, you can try to cross-compile fnlfmt:
# warning: this will first build a cross-compiler wich will take a lot
# of time
$ ./pre-inst-env guix build fnlfmt --target=3Daarch64-linux-gnu
It is not guaranteed that if it builds, it will work, but it is a
useful test.
Greetings,
Maxime.
--=-VW/vTfYhnIF5WaLkkFmB
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYe038RccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7mZTAPwO4rx6MYFlL6MAAT5VnxB97gjs
3ssfFCp08bDYx0MdTAD+KcQ/jNBeu32oVBXDRZ+fcGrcWELbI/8N3wplNaDutgA=
=c5jS
-----END PGP SIGNATURE-----
--=-VW/vTfYhnIF5WaLkkFmB--
From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 23 07:14:52 2022
Received: (at 53456) by debbugs.gnu.org; 23 Jan 2022 12:14:52 +0000
Received: from localhost ([127.0.0.1]:38691 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nBblk-000797-9n
for submit@debbugs.gnu.org; Sun, 23 Jan 2022 07:14:52 -0500
Received: from mail-4022.proton.ch ([185.70.40.22]:26225)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from
) id 1nBblf-00078m-2S
for 53456@debbugs.gnu.org; Sun, 23 Jan 2022 07:14:51 -0500
Date: Sun, 23 Jan 2022 12:14:30 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ndon.dk;
s=protonmail; t=1642940079;
bh=Pj0cR4NADSo8KN3Ux1nmLJ55/9Jns80B/Vy+5ZruOkU=;
h=Date:To:From:Cc:Reply-To:Subject:Message-ID:From:To:Cc;
b=XLJ5lmQE2NBwNUmgM+VddytjH9peQwYvytLWCfUomWXxKBluhPrO8GRL52wgOlFv5
XVshDMY90dbGDQlpRkMAKyuAg/GODBfgBx1AoaM7H9wVO8cZ3S9rUQk4t28JJxM9Ld
jYmcig54MWOdx3o91XKiE133QInyX6Yu4oAgpGu40rVs2Pi/U2Y8rXeqlflh7qP3e4
ADDhnpx9k4jnw9nkFKQk1w9JQB0HIqni2yukqR8M7x91Y+FyfttRCAUYvD93tjQcE3
lOKakg/43hwrTnnPNRVYEQD5h6tKSj4KGt9zRnUitZzMmXn0V7Be9LqR168/Z5Pfg+
+xKk48Q/74Dwg==
To: 53456@debbugs.gnu.org
From: Brandon Lucas
Subject: [PATCH v3 1/2] gnu: Add fnlfmt.
Message-ID: <20220123121405.1123976-1-br@ndon.dk>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no
autolearn=disabled version=3.4.4
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on
mailout.protonmail.ch
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 53456
Cc: Brandon Lucas
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: ,
Reply-To: Brandon Lucas
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit"
X-Spam-Score: -1.0 (-)
* gnu/packages/lua.scm (fnlfmt): New variable.
---
You are right, fennel must be a native-input. Lua must be as well.
Thank you for the tip about cross-compiling. :)
I also simplified to delete-file as suggested.
gnu/packages/lua.scm | 66 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 99f09a26f1..2250990af9 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -15,6 +15,7 @@
;;; Copyright =C2=A9 2020 Paul A. Patience
;;; Copyright =C2=A9 2021 Vin=C3=ADcius dos Santos Oliveira
;;; Copyright =C2=A9 2021 Greg Hogan
+;;; Copyright =C2=A9 2022 Brandon Lucas
;;;
;;; This file is part of GNU Guix.
;;;
@@ -36,12 +37,14 @@ (define-module (gnu packages lua)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
#:use-module (guix build-system meson)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages glib)
@@ -1208,3 +1211,66 @@ (define-public fennel
simplicity, and reach of Lua with the flexibility of a Lisp syntax and mac=
ro
system.")
(license license:expat)))
+
+(define-public fnlfmt
+ (package
+ (name "fnlfmt")
+ (version "0.2.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~technomancy/fnlfmt")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1rv0amqhy5ypi3pvxfaadn3k1cy4mjlc49wdzl2psz3i11w9gr36"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; Use input fennel instead of bundled fennel.
+ (delete-file "fennel")
+ (delete-file "fennel.lua")
+ (substitute* "Makefile"
+ (("./fennel") "fennel"))))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:modules ((guix build gnu-build-system)
+ (guix build utils)
+ (ice-9 match))
+ #:test-target "test"
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'patch-makefile
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (substitute* "Makefile"
+ ;; Patch lua shebang that gets inserted to fnlfmt.
+ (("/usr/bin/env lua")
+ (search-input-file (or native-inputs inputs) "/bin/lua")))))
+ (replace 'install
+ ;; There is no install target; manually install the output file.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin")))
+ (for-each (lambda (file)
+ (install-file file bin))
+ (find-files "." "fnlfmt")))))
+ (add-after 'install 'wrap
+ (lambda* (#:key inputs native-inputs outputs #:allow-other-keys)
+ (let* ((all-inputs (or native-inputs inputs))
+ (fnlfmt (assoc-ref outputs "out"))
+ (lua-version ,(version-major+minor (package-version lua))=
)
+ (fennel (assoc-ref all-inputs "fennel")))
+ (wrap-program (string-append fnlfmt "/bin/fnlfmt")
+ `("LUA_PATH" ";" suffix
+ (,(format #f "~a/share/lua/~a/?.lua" fennel lua-version))))
+ #t))))))
+ (inputs (list bash-minimal))
+ (native-inputs (list lua fennel))
+ (home-page "https://git.sr.ht/~technomancy/fnlfmt")
+ (synopsis "Automatic formatting of Fennel code")
+ (description
+ "Fnlfmt is a tool for automatically formatting Fennel code in a consi=
stent
+way, following established lisp conventions.")
+ (license license:lgpl3+)))
--
2.34.0
From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 23 07:15:03 2022
Received: (at 53456) by debbugs.gnu.org; 23 Jan 2022 12:15:03 +0000
Received: from localhost ([127.0.0.1]:38696 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nBblu-0007AG-L0
for submit@debbugs.gnu.org; Sun, 23 Jan 2022 07:15:02 -0500
Received: from mail-4323.proton.ch ([185.70.43.23]:45649)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from
) id 1nBbls-00079G-Ig
for 53456@debbugs.gnu.org; Sun, 23 Jan 2022 07:15:01 -0500
Date: Sun, 23 Jan 2022 12:14:46 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ndon.dk;
s=protonmail; t=1642940094;
bh=56gwmPGvLQVFbo5hwhCUjK8ZS/Okhp0v3RvBVBcYEVs=;
h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To:
References:From:To:Cc;
b=hS+RkuMcmdSsJEN+mTuYHw+enE32RSyK+Q5WWTwu+iXphB8q4cMKaho/qV2cJoiFA
r7T0m1FUD41Z1oQvfrQfdus4+lWHSOZ3wggsghlRhFHHL8QVHO7DpRexEpbnj1b7h8
Aug72W9mIghzFZhLIWnMyHiUD0+qOfi1LMiQ+Mz6mY8UqqAlQhBcl9ZpoK7Kd7RLax
4hkpv6fqvKPXkpYZNnQQCrlMdNodCpGY8pXwThBr6JozY45jBWb9ANze1/GUKole7B
WsXA8WfXRwITnpqUTlTQ4ZGJnxQnLhN8bzjdoYAZska5YKKolSKnQme++p3QvZi6z4
wdv22jzmWxyMQ==
To: 53456@debbugs.gnu.org
From: Brandon Lucas
Subject: [PATCH v3 2/2] gnu: fennel: Update to 03c1c95.
Message-ID: <20220123121405.1123976-2-br@ndon.dk>
In-Reply-To: <20220123121405.1123976-1-br@ndon.dk>
References: <20220123121405.1123976-1-br@ndon.dk>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no
autolearn=disabled version=3.4.4
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on
mailout.protonmail.ch
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 53456
Cc: Brandon Lucas
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: ,
Reply-To: Brandon Lucas
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit"
X-Spam-Score: -1.0 (-)
* gnu/packages/lua.scm (fennel): Update to 03c1c95.
---
gnu/packages/lua.scm | 66 +++++++++++++++++++++++---------------------
1 file changed, 34 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 2250990af9..4286475a2c 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -1175,42 +1175,44 @@ (define-public emilua
(license license:boost1.0)))
(define-public fennel
- (package
- (name "fennel")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.sr.ht/~technomancy/fennel")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0d4rpf0f2aqxlca3kxrbhjjhf1knhiz8ccwlx8xid05mc16la70y"))))
- (build-system gnu-build-system)
- (arguments
- '(#:make-flags (list (string-append "PREFIX=3D" (assoc-ref %outputs "=
out")))
- #:tests? #t ; even on cross-build
- #:test-target "test"
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-after 'build 'patch-fennel
+ (let ((commit "03c1c95f2a79e45a9baf607f96a74c693b8b70f4")
+ (revision "0"))
+ (package
+ (name "fennel")
+ (version (git-version "1.0.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.sr.ht/~technomancy/fennel")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1znp38h5q819gvcyl248zwvjsljfxdxdk8n82fnj6lyibiiqzgvx"))=
))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:make-flags (list (string-append "PREFIX=3D" (assoc-ref %outputs=
"out")))
+ #:tests? #t ; even on cross-build
+ #:test-target "test"
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'build 'patch-fennel
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "fennel"
- (("/usr/bin/env .*lua")
- (search-input-file inputs "/bin/lua")))))
- (delete 'check)
- (add-after 'install 'check
+ (substitute* "fennel"
+ (("/usr/bin/env .*lua")
+ (search-input-file inputs "/bin/lua")))))
+ (delete 'check)
+ (add-after 'install 'check
(assoc-ref %standard-phases 'check)))))
- (inputs (list lua))
- (home-page "https://fennel-lang.org/")
- (synopsis "Lisp that compiles to Lua")
- (description
- "Fennel is a programming language that brings together the speed,
+ (inputs (list lua))
+ (home-page "https://fennel-lang.org/")
+ (synopsis "Lisp that compiles to Lua")
+ (description
+ "Fennel is a programming language that brings together the speed,
simplicity, and reach of Lua with the flexibility of a Lisp syntax and mac=
ro
system.")
- (license license:expat)))
+ (license license:expat))))
(define-public fnlfmt
(package
--
2.34.0
From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 23 15:50:36 2022
Received: (at 53456) by debbugs.gnu.org; 23 Jan 2022 20:50:36 +0000
Received: from localhost ([127.0.0.1]:41366 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nBjoq-0007pT-1f
for submit@debbugs.gnu.org; Sun, 23 Jan 2022 15:50:36 -0500
Received: from mail-4018.proton.ch ([185.70.40.18]:39823)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from
) id 1nBjon-0007pD-B8
for 53456@debbugs.gnu.org; Sun, 23 Jan 2022 15:50:34 -0500
Date: Sun, 23 Jan 2022 20:50:23 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ndon.dk;
s=protonmail; t=1642971025;
bh=2vqpeYD6waSggDANi25GVzg5ymsp6yHd6AyCzpZEtCk=;
h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To:
References:From:To:Cc;
b=jHQ/q/39Yw4+0blMDdHn24qwY+30bZPOD6LXZAR0VUdfmD9n3ko+RgTi0YPCZWI7b
EIOHPXkUFGFFHdyGEfAZA+488tKsEqmrK6phW1qXUR9oeFEEdnv7E1XhJLHGn8SefH
M9gN949geJ2ykJTDLylnn23w0XLHA3kcRl1YyD9V/1ffAbIoFxfkd55W/tFURvrK+8
XeyQQUUvkOqgX2+cLNPhQ5ekq41BgIl6Y9YaqtWjRVLlN0IHwoTCS1SGHImVNX0o+n
ZzffJIL0WGN7yfYQ+lt3diIZ7EmNJDgl1QJAnf4VRjDdOF/SwEOpVx8x5vxFVcMcDc
ifM8ZEsLkGCVw==
To: Maxime Devos
From: Brandon
Subject: Re: [bug#53456] [PATCH] gnu: Add fnlfmt.
Message-ID:
In-Reply-To: <617c5d3165f9c1693809c2ab3b0c49843f083369.camel@telenet.be>
References: <20220122212723.396566-1-br@ndon.dk>
<617c5d3165f9c1693809c2ab3b0c49843f083369.camel@telenet.be>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no
autolearn=disabled version=3.4.4
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on
mailout.protonmail.ch
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 53456
Cc: 53456@debbugs.gnu.org
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: ,
Reply-To: Brandon
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit"
X-Spam-Score: -1.0 (-)
wrote:
> Would you be up to asking upstream to include a copy of the
> GPL as well (which upstream isn't doing currently)?
Hi Maxime,
I wrote to upstream about this and the inclusion of the expat
license, and the author has updated the repo to include both
the full GPL text as well as the Expat license.
Kind regards,
Brandon.
From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 26 10:52:13 2022
Received: (at 53456-done) by debbugs.gnu.org; 26 Jan 2022 15:52:13 +0000
Received: from localhost ([127.0.0.1]:53248 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from )
id 1nCkai-0001TZ-QI
for submit@debbugs.gnu.org; Wed, 26 Jan 2022 10:52:12 -0500
Received: from hera.aquilenet.fr ([185.233.100.1]:42806)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from ) id 1nCkag-0001TL-WA
for 53456-done@debbugs.gnu.org; Wed, 26 Jan 2022 10:52:11 -0500
Received: from localhost (localhost [127.0.0.1])
by hera.aquilenet.fr (Postfix) with ESMTP id 4648A46F;
Wed, 26 Jan 2022 16:52:04 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at aquilenet.fr
Received: from hera.aquilenet.fr ([127.0.0.1])
by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id hXwrNlSZtsFH; Wed, 26 Jan 2022 16:52:03 +0100 (CET)
Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201])
by hera.aquilenet.fr (Postfix) with ESMTPSA id 3BCAB9E;
Wed, 26 Jan 2022 16:52:02 +0100 (CET)
From: =?utf-8?Q?Ludovic_Court=C3=A8s?=
To: Brandon Lucas
Subject: Re: bug#53456: [PATCH] gnu: Add fnlfmt.
References: <20220122212723.396566-1-br@ndon.dk>
<20220123121405.1123976-1-br@ndon.dk>
Date: Wed, 26 Jan 2022 16:52:01 +0100
In-Reply-To: <20220123121405.1123976-1-br@ndon.dk> (Brandon Lucas's message of
"Sun, 23 Jan 2022 12:14:30 +0000")
Message-ID: <87a6fih4v2.fsf_-_@gnu.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spamd-Bar: /
Authentication-Results: hera.aquilenet.fr;
none
X-Rspamd-Server: hera
X-Rspamd-Queue-Id: 4648A46F
X-Spamd-Result: default: False [0.46 / 15.00]; ARC_NA(0.00)[];
RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[];
RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[];
TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain];
FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+];
R_MIXED_CHARSET(0.56)[subject]; RCVD_COUNT_TWO(0.00)[2];
RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: 53456-done
Cc: Maxime Devos , 53456-done@debbugs.gnu.org
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: -0.0 (/)
Hi,
Brandon Lucas
skribis:
> * gnu/packages/lua.scm (fnlfmt): New variable.
[...]
> * gnu/packages/lua.scm (fennel): Update to 03c1c95.
Applied.
Since we normally don=E2=80=99t package snapshots, I took the liberty to ad=
d the
justification you gave as a comment in next to the commit definition.
Thank you, and thanks Maxime for the thorough review!
Ludo=E2=80=99.
From unknown Sat Aug 16 00:33:17 2025
Received: (at fakecontrol) by fakecontrolmessage;
To: internal_control@debbugs.gnu.org
From: Debbugs Internal Request
Subject: Internal Control
Message-Id: bug archived.
Date: Thu, 24 Feb 2022 12:24:08 +0000
User-Agent: Fakemail v42.6.9
# This is a fake control message.
#
# The action:
# bug archived.
thanks
# This fakemail brought to you by your local debbugs
# administrator