From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 23 18:18:00 2024 Received: (at submit) by debbugs.gnu.org; 23 Aug 2024 22:18:00 +0000 Received: from localhost ([127.0.0.1]:40193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1shcbX-0006nc-P0 for submit@debbugs.gnu.org; Fri, 23 Aug 2024 18:18:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:46136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1shcbW-0006nU-8C for submit@debbugs.gnu.org; Fri, 23 Aug 2024 18:17:59 -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 1shcak-0006f3-8K for guix-patches@gnu.org; Fri, 23 Aug 2024 18:17:10 -0400 Received: from confino.investici.org ([93.190.126.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1shcah-0005FX-F9 for guix-patches@gnu.org; Fri, 23 Aug 2024 18:17:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1724451414; bh=lP5zBt2VeWGcFhjQM2qlKzYFlTptsRW9aFrCW4bwI7w=; h=From:To:Cc:Subject:Date:From; b=sYM37OWYvhE7z06/IQ3dUpZldGU8LPfFyGiNdG/1ava1xOGcREHJQ/ZAKjNgfAM99 Y3oqOc1tO1rpHVhKDSapjNJIdj/zGA62j7jb0MV7XqpeBRv4RYyZ7mIWn6DLp7pXGi avQllqJpPRf89SXc43BE7dswKoTeBIbLNqVxTlTk= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4WrDvB3w1dz11GX; Fri, 23 Aug 2024 22:16:54 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4WrDvB37C9z110r; Fri, 23 Aug 2024 22:16:54 +0000 (UTC) From: Giacomo Leidi To: guix-patches@gnu.org Subject: [PATCH] gnu: Add oils. Date: Sat, 24 Aug 2024 00:16:45 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=93.190.126.19; envelope-from=goodoldpaul@autistici.org; helo=confino.investici.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Giacomo Leidi 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: -2.4 (--) Since release 0.16.0 the former Oil project has been renamed to Oils (https://www.oilshell.org/blog/2023/03/rename.html). This patch deprecates the old oil package in favor of a new oils package updated to the latest version. Additionally since release 0.21.0 Oils is completely free from bundled Python code. * gnu/packages/shells.scm (oils): New variable; [source]: Remove mention of bundled Python sources, from release 0.21.0 it is no more the case; [phases]: use Oils build system. (oil): Deprecate in favor of oils. Change-Id: I4455ec1e6f4335cc6e67cd8f2c3808e2aef24c4f --- gnu/packages/shells.scm | 52 ++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index d7fb2317cb..9e08ef39f0 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2023 Jaeme Sifat ;;; Copyright © 2024 Tanguy Le Carrour ;;; Copyright © 2024 Vinicius Monego +;;; Copyright © 2024 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,6 +91,7 @@ (define-module (gnu packages shells) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system trivial) + #:use-module (guix deprecation) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix gexp) @@ -905,27 +907,20 @@ (define-public mksh (license (list license:miros license:isc)))) ; strlcpy.c -(define-public oil +(define-public oils (package - (name "oil") - (version "0.20.0") + (name "oils") + (version "0.22.0") (source - ;; oil's sources contain a modified version of CPython 2.7.13. - ;; According to https://www.oilshell.org/blog/2017/05/05.html - ;; this bundles version of CPython had certain unused parts removed - ;; and its build system has been replaced by a custom one. - ;; This would probably make it quite complicated to replace the - ;; bundled CPython with the one from the python2 package. (origin (method url-fetch) - (uri (string-append "https://www.oilshell.org/download/oil-" + (uri (string-append "https://www.oilshell.org/download/oils-for-unix-" version ".tar.gz")) (sha256 - (base32 "1jpxhixwq29ik01jx372g9acib59wmww8lrdlcypq7jpg5b0b7pi")))) + (base32 "0pylgbxbnp683g51lcbmmd0y149jm7q7vh8g67yviagsa7clmmks")))) (build-system gnu-build-system) (arguments - (list #:strip-binaries? #f ; strip breaks the binary - #:phases + (list #:phases #~(modify-phases %standard-phases (replace 'configure (lambda _ @@ -934,24 +929,37 @@ (define-public oil ((" cc ") " $CC ")) (invoke "./configure" (string-append "--prefix=" #$output) "--with-readline"))) + (replace 'build + (lambda _ + (invoke "_build/oils.sh"))) + (replace 'install + (lambda _ + (setenv "PREFIX" #$output) + (invoke "./install"))) (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.0/INSTALL.txt#L38-L48 + ;; https://github.com/oilshell/oil/blob/release/0.22.0/INSTALL.txt#L30-L50 (lambda* (#:key tests? #:allow-other-keys) (when tests? - (let* ((oil "_bin/oil.ovm")) - (invoke/quiet oil "osh" "-c" "echo hi") - (invoke/quiet oil "osh" "-n" "configure")))))))) + (let ((osh "_bin/cxx-opt-sh/osh") + (ysh "_bin/cxx-opt-sh/ysh")) + (invoke/quiet osh "-c" "echo hi") + (invoke/quiet osh "-n" "configure") + (invoke/quiet ysh "-c" "echo hi") + (invoke/quiet ysh "-c" + "json write ({x: 42})")))))))) (inputs (list readline)) (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 license:psfl ; tarball includes python2.7 - license:asl2.0)))) + (description "Oils is a programming language with automatic translation for +Bash. It includes OSH, a Unix/POSIX shell that runs unmodified Bash +scripts and YSH is a legacy-free shell, with structured data for Python and +JavaScript users who avoid shell.") + (license (list license:asl2.0)))) + +(define-deprecated/public-alias oil oils) (define-public gash (package base-commit: d48af5cca84914d44b032d0bf0820640ebbe7a4b -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 04 11:53:34 2024 Received: (at 72776-done) by debbugs.gnu.org; 4 Oct 2024 15:53:34 +0000 Received: from localhost ([127.0.0.1]:36306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1swkcY-0005WO-AT for submit@debbugs.gnu.org; Fri, 04 Oct 2024 11:53:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1swkcV-0005W9-OM for 72776-done@debbugs.gnu.org; Fri, 04 Oct 2024 11:53:32 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1swkcL-0000BT-Qd; Fri, 04 Oct 2024 11:53:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=Ylc99pOLJX58FtpDoDBP8uXRut52KeYXpLLtGLNV5lg=; b=WlTCDxISqEpQVPQWLdS5 OTB2oFXazWaCaiJB3Y64EdTSDGZwB4OmV6AOMagj3c70R3f8VhYKCEI0NLLL6J3y9UPnBcWg4CLxi TyNqCHTmU2g47PAX38DpjmsNkEv7EWZe0VSQ+fULvevsv8Epirjq7Ys87Gb9DYuHcMk0NwGLHyvcm ihYUpAQ8BPsYYICAQ9PzMr9/fs4PB0SPZwoM9lbzflXmX3YzHSfXpgGRSgpYkGuMxg+G83OIpHy8B aHrjlmShXsCwnVtpJDS8bJHQeNIyL2ordWQ8z8px+d1yrJiCclTHvof9wR44WGBE7BCI1rUiR2fLa I+J8QZgh5uKZIA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Giacomo Leidi Subject: Re: [bug#72776] [PATCH] gnu: Add oils. In-Reply-To: (Giacomo Leidi's message of "Sat, 24 Aug 2024 00:16:45 +0200") References: Date: Fri, 04 Oct 2024 17:53:19 +0200 Message-ID: <875xq7rhjk.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72776-done Cc: 72776-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: -3.3 (---) --=-=-= Content-Type: text/plain Giacomo Leidi skribis: > Since release 0.16.0 the former Oil project has been renamed to > Oils (https://www.oilshell.org/blog/2023/03/rename.html). This patch > deprecates the old oil package in favor of a new oils package updated to > the latest version. Additionally since release 0.21.0 Oils is > completely free from bundled Python code. > > * gnu/packages/shells.scm (oils): New variable; > [source]: Remove mention of bundled Python sources, from release 0.21.0 > it is no more the case; > [phases]: use Oils build system. > (oil): Deprecate in favor of oils. > > Change-Id: I4455ec1e6f4335cc6e67cd8f2c3808e2aef24c4f Applied with the change below, thanks! Ludo'. --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 79f1c8a0a5..fa85704d37 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -93,7 +93,6 @@ (define-module (gnu packages shells) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system trivial) - #:use-module (guix deprecation) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix gexp) @@ -970,7 +969,10 @@ (define-public oils JavaScript users who avoid shell.") (license (list license:asl2.0)))) -(define-deprecated/public-alias oil oils) +(define-public oil + ;; Since release 0.16.0 the former Oil project has been renamed to Oils: + ;; . + (deprecated-package "oil" oils)) (define-public gash (package --=-=-=-- From unknown Sun Aug 17 22:13:03 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 02 Nov 2024 11:24:16 +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