From: Ryan Prior via Guix-patches via <guix-patches@gnu.org>
To: Tobias Geerinckx-Rice <me@tobias.gr>
Cc: "41010@debbugs.gnu.org" <41010@debbugs.gnu.org>
Subject: [bug#41010] Upgrade Oil to 0.8.pre4
Date: Sun, 17 May 2020 06:14:55 +0000 [thread overview]
Message-ID: <87o8qnkrz9.fsf@protonmail.com> (raw)
In-Reply-To: <87v9kwnn32.fsf@nckx>
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
Tobias Geerinckx-Rice <me@tobias.gr> writes:
> Unfortunately I still can't apply this onto upstream/master:
I rebased my branch off of master and created a new patch, attached.
Hope that helps!
Ryan
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-oil-Update-to-0.8.pre4.patch --]
[-- Type: text/x-diff; name="0001-gnu-oil-Update-to-0.8.pre4.patch", Size: 4301 bytes --]
From ec658018df50a7463564a5877ab60945451c6052 Mon Sep 17 00:00:00 2001
From: Ryan Prior <rprior@protonmail.com>
Date: Fri, 1 May 2020 14:49:42 -0500
Subject: [PATCH 1/1] gnu: oil: Update to 0.8.pre4
gnu/packages/shells.scm (oil): Update to 0.8.pre4.
---
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 5c8c4b5d8a..1582236873 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -14,6 +14,7 @@
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -783,47 +784,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.pre4") ; 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 "0m2p8p5hi2r14xx9pphsa0ar56kqsa33gr2w2blc3jx07aqhjpzy"))))
(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=" out)
+ (substitute* "configure"
+ ((" cc ") " gcc "))
+ (invoke "./configure"
+ (string-append "--prefix=" 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.pre4/INSTALL.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 can be
-automatically translated. The Oil language is a superset of Bash. It also
-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 source 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))))
(define-public oil-shell
--
2.17.1
next prev parent reply other threads:[~2020-05-17 6:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-01 20:01 [bug#41010] Rename & upgrade oil-shell Ryan Prior via Guix-patches via
2020-05-01 21:01 ` [bug#41010] Upgrade Oil to 0.8.pre4 Ryan Prior via Guix-patches via
2020-05-01 23:23 ` Tobias Geerinckx-Rice via Guix-patches via
2020-05-01 23:33 ` Tobias Geerinckx-Rice via Guix-patches via
2020-05-02 4:02 ` Ryan Prior via Guix-patches via
2020-05-15 17:10 ` Ryan Prior via Guix-patches via
2020-05-15 18:31 ` Tobias Geerinckx-Rice via Guix-patches via
2020-05-16 11:20 ` Tobias Geerinckx-Rice via Guix-patches via
2020-05-17 6:14 ` Ryan Prior via Guix-patches via [this message]
2020-05-02 19:16 ` Leo Famulari
2020-05-28 23:38 ` [bug#41010] [PATCH 0/1] Updated patch for 0.8.pre5 Ryan Prior via Guix-patches via
2020-05-28 23:38 ` [bug#41010] [PATCH 1/1] gnu: oil: Update to 0.8.pre5 Ryan Prior via Guix-patches via
2020-05-29 4:48 ` bug#41010: [PATCH 0/1] Updated patch for 0.8.pre5 Tobias Geerinckx-Rice via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o8qnkrz9.fsf@protonmail.com \
--to=guix-patches@gnu.org \
--cc=41010@debbugs.gnu.org \
--cc=me@tobias.gr \
--cc=rprior@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.