From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uMlFC5KvrF4mJgAA0tVLHw (envelope-from ) for ; Fri, 01 May 2020 23:24:02 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4N33DZuvrF4eRAAAB5/wlQ (envelope-from ) for ; Fri, 01 May 2020 23:24:11 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::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 1FB75941A0A for ; Fri, 1 May 2020 23:24:10 +0000 (UTC) Received: from localhost ([::1]:35040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUf0q-0002kw-8h for larch@yhetil.org; Fri, 01 May 2020 19:24:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUf0l-0002eu-JV for guix-patches@gnu.org; Fri, 01 May 2020 19:24:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUf0k-0002i1-Mj for guix-patches@gnu.org; Fri, 01 May 2020 19:24:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39366) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUf0k-0002hc-A5 for guix-patches@gnu.org; Fri, 01 May 2020 19:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUf0k-0002C0-73 for guix-patches@gnu.org; Fri, 01 May 2020 19:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41010] Upgrade Oil to 0.8.pre4 Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 May 2020 23:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41010 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: rprior@protonmail.com, 41010@debbugs.gnu.org X-Debbugs-Original-To: Ryan Prior , Ryan Prior via Guix-patches X-Debbugs-Original-Cc: "41010@debbugs.gnu.org" <41010@debbugs.gnu.org> Received: via spool by submit@debbugs.gnu.org id=B.15883754188394 (code B ref -1); Fri, 01 May 2020 23:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 May 2020 23:23:38 +0000 Received: from localhost ([127.0.0.1]:50912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUf0C-0002B8-FM for submit@debbugs.gnu.org; Fri, 01 May 2020 19:23:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:40124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUf0A-0002B1-Uc for submit@debbugs.gnu.org; Fri, 01 May 2020 19:23:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUf0A-0001CG-8T for guix-patches@gnu.org; Fri, 01 May 2020 19:23:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUf09-000225-9o for guix-patches@gnu.org; Fri, 01 May 2020 19:23:25 -0400 Received: from tobias.gr ([2a02:c205:2020:6054::1]:48594) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUf08-0001oh-I3 for guix-patches@gnu.org; Fri, 01 May 2020 19:23:24 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 8a6ea989; Fri, 1 May 2020 23:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to:cc :subject:message-id:references:in-reply-to:date:mime-version :content-type; s=2018; i=me@tobias.gr; bh=JibaDBoU/2wsCBxlJHpVqG sztk9p2ugGOTRDxFDPK20=; b=Qe7bxb0bexnQ0KGmWxrS77DOuut3frKrUAqqJ+ ZLYylz19P3p8SLWH4YOeBCyRKE8HTYeRnWArXW9VLSSRHg0Pv/d/F9L7a146J18s dJVXqz3Twa8hUs9HHDdnSbiHF7xhrC84J8vLGstHR3RUFuZdJVjru8Fujk3s7Ku+ UQWIshzqm0rNi4acA1JcknLEvuwOfM7H+MGEcbPGm3sW/lRmPQMFOJ9p/3zxDyTq +adLqJduBTMgE9R0APSIRMiiUVXtQXkFg0+qleWmrBpnORkeiW5hE2avGIqDUgej rqhHwVCG5KItt24pPB3gDSSR26q+l8g6YK/iOCnU7S0gvTrA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 77c779b5 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Fri, 1 May 2020 23:23:19 +0000 (UTC) Message-ID: <87sggjfdef.fsf@nckx> References: In-reply-to: Instead: Date: Sat, 02 May 2020 01:23:30 +0200 MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a02:c205:2020:6054::1; envelope-from=me@tobias.gr; helo=tobias.gr X-detected-operating-system: by eggs.gnu.org: Error: [-] PROGRAM ABORT : Malformed IPv6 address (bad octet value). Location : parse_addr6(), p0f-client.c:67 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 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" Reply-to: Tobias Geerinckx-Rice , Tobias Geerinckx-Rice via Guix-patches From: Tobias Geerinckx-Rice via Guix-patches via X-Scanner: scn0 X-Spam-Score: -1.61 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=tobias.gr header.s=2018 header.b=Qe7bxb0b; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [-1.61 / 13.00]; HAS_REPLYTO(0.00)[me@tobias.gr]; GENERIC_REPUTATION(0.00)[-0.49531595073739]; DWL_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; R_DKIM_REJECT(1.00)[tobias.gr:s=2018]; TO_DN_NONE(0.00)[]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.16), country: US(-0.00), ip: 2001:470:142::17(-0.50)]; DKIM_TRACE(0.00)[tobias.gr:-]; RCPT_COUNT_TWO(0.00)[2]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; MAILLIST(-0.20)[mailman]; SIGNED_PGP(-2.00)[]; FREEMAIL_TO(0.00)[protonmail.com,debbugs.gnu.org]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_NEQ_ENVFROM(0.00)[guix-patches@gnu.org,guix-patches-bounces@gnu.org]; ARC_NA(0.00)[]; URIBL_BLOCKED(0.00)[oilshell.org:url]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[gnu.org]; HAS_LIST_UNSUB(-0.01)[]; DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_COUNT_SEVEN(0.00)[11]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: 5OrpQ1jE55f6 --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Ryan, > This patch upgrades the oil package. As noted in the package=20 > description, upstream considers this to be a stable release &=20 > the best available version of oil despite the "pre" tag. Thanks! I agree with the name change, although I'm unaware of why=20 =E2=80=98oil-shell=E2=80=99 was originally chosen. However, please do build and test patches before submitting them.=20 These were broken in 2 places: adding the unused =E2=80=98license:=E2=80=99= prefix=20 breaks evaluation, as does referring to a variable (=E2=80=98oil=E2=80=99 i= n=20 deprecated-package) before it's defined. > Subject: [PATCH] gnu: oil: Update to 0.8.pre4 Add a full stop after commit summaries, and a =E2=80=98change log=E2=80=99 = entry=20 as commit body: * gnu/packages/shells.scm (oil): Update to 0.8.pre4. > + (version "0.8.pre4") ; "Despite the pre4 version qualifier,=20 > this is by far > + ; the best Oil release ever=E2=80=A6 I may=20 > change the version > + ; numbering scheme in the near future=20 > to reflect this." > + ; - upstream on whether to ship pre4=20 > in Guix ;; "Despite the pre4 version qualifier, this is by far ;; the best Oil release ever=E2=80=A6 I may change the version ;; numbering scheme in the near future to reflect this." ;; - upstream on whether to ship pre4 in Guix (version "0.8.pre4") Format long and/or multi-line comments like so: OTOH a one-line link to that thread, if one exists, would be=20 preferable. > + (source > + (origin > + (method url-fetch) > + (uri (string-append=20 > "https://www.oilshell.org/download/oil-" > + version ".tar.gz")) > + (sha256 > + (base32 > +=20 > "0m2p8p5hi2r14xx9pphsa0ar56kqsa33gr2w2blc3jx07aqhjpzy")))) If you're going to re-indent like this, the hash fits beside=20 (base32 =E2=80=A6. > - #:strip-binaries? #f ; the binaries cannot be stripped > + `(#:strip-binaries? #f ; Strip breaks the binary. I like your comment better but the original formatting (lowercase,=20 no full stop) was fine. > + (setenv "CC" "gcc") > (let ((out (assoc-ref outputs "out"))) > - (setenv "CC" "gcc") (let ((out (assoc-ref outputs "out"))) (do-something "foo") (do-something out)) It's canonical style in Guix (not sure about wider Schemeland) to=20 =E2=80=98bind early=E2=80=99: (do-something "foo") (let ((out (assoc-ref outputs "out"))) (do-something out)) While you'll find a fair share of it's much less common, possibly frowned upon, and idly rearranging=20 existing code is right out. > + (substitute* "configure" > + ((" cc ") " gcc ")) (substitute* "configure" ((" cc ") " $CC ")) > + (invoke > + "./configure" More line nitpicking: keep these on one line & indent the other=20 arguments accordingly. > + (replace 'check ; The tests are not distributed in the=20 > tarballs but > + ; upstream recommends running this=20 > smoke test. Same as above: (replace 'check ;; The tests are not distributed in the tarballs but upstream ;; recommends running this smoke test. =E2=80=A6 Where do they recommend this? It's nice to have a link in case=20 the recommendation changes. > + (native-inputs Nak. =E2=80=98Native=E2=80=99 means =E2=80=98when cross compiling, don't b= other building=20 this for the target architecture, it will only ever run on the=20 host=E2=80=99=E2=80=A6 > `(("readline" ,readline))) =E2=80=A6as =E2=80=98guix gc --references oil=E2=80=99 (and readline's gene= ral nature)=20 tell us, that's not the case here: Oil links to it at run time, so=20 it must not be native. > - (synopsis "Bash-compatible Unix shell") > - (description "Oil is a Unix / POSIX shell, compatible with=20 > Bash. It > -implements the Oil language, which is a new shell language to=20 > which Bash can be > -automatically translated. The Oil language is a superset of=20 > Bash. It also > -implements the OSH language, a statically-parseable language=20 > based on Bash as it > -is commonly written.") [=E2=80=A6] > + (synopsis "A Unix shell") > + (description "Oil is a Unix shell and programming=20 > language. It's our upgrade > +path from Bash.") Both the original synopsis and description are much better. If=20 certain things are no longer accurate they can be adjusted but=20 this is just upstream's marketing pitch. > + (license (list license:psfl ; Tarball vendors python2.7 Hmm, this doesn't parse as English (it's missing a verb). I'd=20 guess typo=E2=80=A6 but for what? Are upstream the =E2=80=98tarball vendo= rs=E2=80=99=20 here? What was wrong with the original comment? If upstream still bundles Python (and it would seem so), that's=20 important information that shouldn't be removed. Phew. =E2=80=98I'll just review this trivial bump before bed-time.=E2=80= =99 This=20 patch changes lots of things for one small package. I hope you=20 don't mind lots of comments :-) Kind regards, T G-R --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCXqyvcwAKCRANsP+IT1Vt eYFGAP9ZAvffgA9WEx8i+0O3uyD0nhUkDvJh8DJVOS9dfOXOXAEAwP0TqycO+xVi RnvfMAzoag62FoCLM+CuLTXUUptMoAk= =JQ1t -----END PGP SIGNATURE----- --=-=-=--