From patchwork Sun Mar 24 09:49:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 62211 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EAF3B27BBEA; Sun, 24 Mar 2024 09:51:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CAA2127BBE2 for ; Sun, 24 Mar 2024 09:51:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1roKVe-00009n-4f; Sun, 24 Mar 2024 05:51:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1roKVd-00009L-0c for guix-patches@gnu.org; Sun, 24 Mar 2024 05:51:21 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1roKVc-0008VQ-P7 for guix-patches@gnu.org; Sun, 24 Mar 2024 05:51:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1roKWI-0006Pj-Cl for guix-patches@gnu.org; Sun, 24 Mar 2024 05:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69973] [PATCH] gnu: Add oils-for-unix. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Mar 2024 09:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69973 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69973@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171127388724532 (code B ref -1); Sun, 24 Mar 2024 09:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Mar 2024 09:51:27 +0000 Received: from localhost ([127.0.0.1]:44858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roKVi-0006NX-EU for submit@debbugs.gnu.org; Sun, 24 Mar 2024 05:51:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:48742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roKVf-0006NK-Qh for submit@debbugs.gnu.org; Sun, 24 Mar 2024 05:51:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1roKUz-0008Oy-Px for guix-patches@gnu.org; Sun, 24 Mar 2024 05:50:41 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1roKUt-0008Lv-Hb for guix-patches@gnu.org; Sun, 24 Mar 2024 05:50:41 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 67AB6240028 for ; Sun, 24 Mar 2024 10:50:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711273831; bh=f53urjZ7YamVQvEbrvMmof46q+47OhMX9VFDhgshEcw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=R0gDwWE6yrZKK9XFIiUVutu6GIR28OwBarGR+M0poD6I3Cnq50x46cwnVkJOSHAip 1h2p1wJdagf+ySyWdRp04gEXGVOpQS5nbdxONucRpB9NLyKmthiPDbD3qHTm7xvCqY EQdH3YgMvjJ/c0l8gqfEziG2COvi3UUSBT+WCESS/EFyHxuUlst894LSFJwcWrc3tS SJK0osI+MpmlQz/mvCMxLDyQQ538BSpXuQsj3a8OGMWpgOBXImAbB+HMPLiPHue5O2 XAuYOoDZfK5PYCayoLqmfke/U7HcvPRloFnzAXx6xlFonaaTFi1CAPGs2+mXi7cPuY Q3NoMXULDbRHQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V2WX663hwz6tsb; Sun, 24 Mar 2024 10:50:30 +0100 (CET) From: Felix Gruber Date: Sun, 24 Mar 2024 09:49:32 +0000 Message-ID: <2a2a91336b8999ab67273b6d99b5d68dc7495ac9.1711273771.git.felgru@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=felgru@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/shells.scm (oils-for-unix): New variable. Change-Id: I0422f9d9ab6b67fb0b07d5b8bfcca7b1524baf26 --- gnu/packages/shells.scm | 49 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) base-commit: 28bc0e870b4d48b8e3e773382bb0e999df2e3611 diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index ae4e73956e..eb74a3f124 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2020, 2022 Efraim Flashner ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2021, 2022 Nicolas Goaziou -;;; Copyright © 2021, 2022 Felix Gruber +;;; Copyright © 2021, 2022, 2023, 2024 Felix Gruber ;;; Copyright © 2022 Andrew Tropin ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 David Pflug @@ -906,6 +906,53 @@ (define-public oil (license (list license:psfl ; tarball includes python2.7 license:asl2.0)))) +(define-public oils-for-unix + (package + (name "oils-for-unix") + (version "0.21.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.oilshell.org/download/oils-for-unix-" + version ".tar.gz")) + (sha256 + (base32 "0kk5mj6x2d6h1d22ig2c3nwsqj995hw1ijab3h11px09mwmq9jw3")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cc + (lambda _ + (substitute* "configure" + (("cc ") "gcc ")))) + ;; The 'configure' script is not generated by autoconf and can't + ;; cope with "SHELL=" and "CONFIG_SHELL=" arguments, so we + ;; pass a custom set of arguments. + (replace 'configure + (lambda* (#:key build inputs outputs #:allow-other-keys) + (let ((bash (which "bash")) + (out (assoc-ref outputs "out"))) + (invoke bash "./configure" + (string-append "--prefix=" out) + (string-append "--build=" build) + "--with-readline")))) + (replace 'build + (lambda _ + (invoke "_build/oils.sh"))) + (replace 'install + (lambda _ + (invoke "./install")))))) + (inputs + (list readline)) + (home-page "https://www.oilshell.org/") + (synopsis "Programming language and Bash-compatible Unix shell") + (description "Oils contains two shells. The Bash-compatible OSH +and YSH, which is incompatible with Bash scripts as it tries to +modernize the shell syntax by adding features known from scripting +languages like Python or Ruby.") + (license license:asl2.0))) + (define-public gash (package (name "gash")