From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id JYFwIe9L0F5+ZwAA0tVLHw (envelope-from ) for ; Thu, 28 May 2020 23:40:31 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id GKfxHO9L0F59SQAAbx9fmQ (envelope-from ) for ; Thu, 28 May 2020 23:40:31 +0000 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 0897D9400C3 for ; Thu, 28 May 2020 23:40:31 +0000 (UTC) Received: from localhost ([::1]:40144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeS8U-00048g-1N for larch@yhetil.org; Thu, 28 May 2020 19:40:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeS82-0003qg-M6 for guix-patches@gnu.org; Thu, 28 May 2020 19:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41727) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jeS82-0001uG-Aa for guix-patches@gnu.org; Thu, 28 May 2020 19:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jeS82-0007On-7j for guix-patches@gnu.org; Thu, 28 May 2020 19:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41010] [PATCH 1/1] gnu: oil: Update to 0.8.pre5 Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 May 2020 23:40: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: 41010@debbugs.gnu.org Received: via spool by 41010-submit@debbugs.gnu.org id=B41010.159070914428371 (code B ref 41010); Thu, 28 May 2020 23:40:02 +0000 Received: (at 41010) by debbugs.gnu.org; 28 May 2020 23:39:04 +0000 Received: from localhost ([127.0.0.1]:53273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jeS76-0007NX-A8 for submit@debbugs.gnu.org; Thu, 28 May 2020 19:39:04 -0400 Received: from mail2.protonmail.ch ([185.70.40.22]:57665) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jeS74-0007Mx-KW for 41010@debbugs.gnu.org; Thu, 28 May 2020 19:39:03 -0400 Date: Thu, 28 May 2020 23:38:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1590709136; bh=qYLROCnVr2iBOI8+nYSIKh0ASXyP+JzjTM6zPgDaHTM=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=G6FCSlT6Nf5+g8i5nbxs1ySYVxdEMCZXV72EzNj4iRmTe63/X9/416ebsfDrQFFHi 4vj4SwsnOLpTYGNo5qPgTnwwIKj+sCLzJx2o3eL15SQZSCGucFAmhb5o26SABYShYL zLsrpjaFi377FES7Hym/ZgkpVLXlAtbJfUBj6Xbs= Message-ID: <20200528233825.15320-2-rprior@protonmail.com> In-Reply-To: <20200528233825.15320-1-rprior@protonmail.com> References: <20200528233825.15320-1-rprior@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) 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: Ryan Prior , Ryan Prior via Guix-patches From: Ryan Prior via Guix-patches via X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=protonmail.com header.s=protonmail header.b=G6FCSlT6; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -0.01 X-TUID: 7WLbtt7BSSg8 gnu/packages/shells.scm (oil): Update to 0.8.pre5. --- gnu/packages/shells.scm | 56 ++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index fa3eccabd4..147ba24c3f 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -14,6 +14,7 @@ ;;; Copyright =C2=A9 2019 Mathieu Othacehe ;;; Copyright =C2=A9 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright =C2=A9 2020 Brice Waegeneire +;;; Copyright =C2=A9 2020 Ryan Prior ;;; ;;; This file is part of GNU Guix. ;;; @@ -793,47 +794,44 @@ Shell (pdksh).") (define-public oil (package (name "oil") - (version "0.7.0") - (source (origin - (method url-fetch) - (uri (string-append "https://www.oilshell.org/download/oil-" - version ".tar.xz")) - (sha256 - (base32 - "12c9s462879adb6mwd3fqafk0dnqsm16s18rhym6cmzfzy8v8zm3")))) + (version "0.8.pre5") ; https://www.oilshell.org/blog/2020/04/release-0= .8.pre4.html#comment-on-version-numbering + (source + (origin + (method url-fetch) + (uri (string-append "https://www.oilshell.org/download/oil-" + version ".tar.gz")) + (sha256 + (base32 "02llxx10izxpv1y32qn8k6r0y7al01rzxjirc8h6x8nd9kiaqknl")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; the tests are not distributed in the tarballs - #:strip-binaries? #f ; the binaries cannot be stripped + `(#:strip-binaries? #f ; strip breaks the binary #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-compiler-invocation - (lambda _ - (substitute* "configure" - ((" cc ") " gcc ")) - #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (setenv "CC" "gcc") - ;; The configure script doesn't recognize CONFIG_SHELL. - (setenv "CONFIG_SHELL" (which "sh")) - (invoke "./configure" (string-append "--prefix=3D" out) + (substitute* "configure" + ((" cc ") " gcc ")) + (invoke "./configure" + (string-append "--prefix=3D" out) "--with-readline")))) - (add-before 'install 'make-destination + (replace 'check + ;; The tests are not distributed in the tarballs but upstream + ;; recommends running this smoke test. + ;; https://github.com/oilshell/oil/blob/release/0.8.pre5/INSTAL= L.txt#L38-L48 (lambda _ - ;; The build scripts don't create the destination directory. - (mkdir-p (string-append (assoc-ref %outputs "out") "/bin"))))= ))) + (let* ((oil "_bin/oil.ovm")) + (invoke/quiet oil "osh" "-c" "echo hi") + (invoke/quiet oil "osh" "-n" "configure"))))))) (inputs `(("readline" ,readline))) - (synopsis "Bash-compatible Unix shell") - (description "Oil is a Unix / POSIX shell, compatible with Bash. It -implements the Oil language, which is a new shell language to which Bash c= an be -automatically translated. The Oil language is a superset of Bash. It als= o -implements the OSH language, a statically-parseable language based on Bash= as it -is commonly written.") - (home-page "https://www.oilshell.org/") - (license (list psfl ; The Oil sources include a patched Python 2 sourc= e tree + (home-page "https://www.oilshell.org") + (synopsis "Programming language and Bash-compatible Unix shell") + (description "Oil is a programming language with automatic translation= for +Bash. It includes osh, a Unix/POSIX shell that runs unmodified Bash +scripts.") + (license (list psfl ; tarball includes python2.7 asl2.0)))) =20 (define-public oil-shell --=20 2.26.2