From patchwork Sat Jun 19 15:50:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 30509 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 CA31227BC81; Sat, 19 Jun 2021 16:54:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9195627BC78 for ; Sat, 19 Jun 2021 16:54:34 +0100 (BST) Received: from localhost ([::1]:49382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ludIn-0005tG-Mo for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:54:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ludFP-0000Ve-C8 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48998) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ludFP-0003ec-3T for guix-patches@gnu.org; Sat, 19 Jun 2021 11:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ludFP-0006qO-3B for guix-patches@gnu.org; Sat, 19 Jun 2021 11:51:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49101] [PATCH v3 2/6] gnu: ocaml4.07-expect: Switch to default OCaml compiler. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49101 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49101@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 49101-submit@debbugs.gnu.org id=B49101.162411784626213 (code B ref 49101); Sat, 19 Jun 2021 15:51:03 +0000 Received: (at 49101) by debbugs.gnu.org; 19 Jun 2021 15:50:46 +0000 Received: from localhost ([127.0.0.1]:60528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ludF7-0006oi-Qw for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:50:46 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:49068 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ludF3-0006np-DX for 49101@debbugs.gnu.org; Sat, 19 Jun 2021 11:50:42 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1624117835; bh=jVTyy20DOz59BHtb+UUvRyFK9YA59B5T0DYxML3Osbk=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=Jkj7XPLCtQgq+tgxIH+FgXOXIT2WNxu3Z8NGZWPFTLXsC44NksTuV2DCYwWEVSJu7 g6Dgu5bmwsU6+DyhBtHffBeqGZfpImYpXV+3x6FWuIvPBoSXydHSDLWRXOvw4atvuP 4nirazFcMv3Xp0ZoviZ10efJBtKRZwalBjgh+PRw= In-Reply-To: References: Message-Id: <30f7fe1b11ad75966da59ade74cede77b487d27a.1624117491.git.public@yoctocell.xyz> Date: Sat, 19 Jun 2021 17:50:35 +0200 MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml4.07-expect): Rename to ‘ocaml-expect’. [arguments]: Use default OCaml compiler. [native-inputs]: Use ‘ocaml-*’ packages instead of ‘ocaml4.07-*’. [propagated-inputs]: Likewise. [description]: Make it a full sentence. --- gnu/packages/ocaml.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 542730699e..d3674ccba8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3148,9 +3148,9 @@ matching and substitution, similar to the functionality offered by the Perl language.") (license license:lgpl2.1+))); with the OCaml link exception -(define-public ocaml4.07-expect +(define-public ocaml-expect (package - (name "ocaml4.07-expect") + (name "ocaml-expect") (version "0.0.6") (source (origin (method url-fetch) @@ -3159,21 +3159,20 @@ language.") (base32 "098qvg9d4yrqzr5ax291y3whrpax0m3sx4gi6is0mblc96r9yqk0")))) (arguments - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + `(#:tests? #f)) (build-system ocaml-build-system) (native-inputs - `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)) - ("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) - ("ocaml-pcre" ,ocaml4.07-pcre) - ("ounit" ,(package-with-ocaml4.07 ocaml-ounit)))) + `(("ocamlbuild" ,ocamlbuild) + ("ocaml-num" ,ocaml-num) + ("ocaml-pcre" ,ocaml-pcre) + ("ounit" ,ocaml-ounit))) (propagated-inputs - `(("batteries" ,(package-with-ocaml4.07 ocaml-batteries)))) + `(("batteries" ,ocaml-batteries))) (home-page "https://forge.ocamlcore.org/projects/ocaml-expect/") (synopsis "Simple implementation of expect") - (description "Help building unitary testing of interactive program. You -can match the question using a regular expression or a timeout.") + (description "This package provides utilities for building unitary testing +of interactive program. You can match the question using a regular expression +or a timeout.") (license license:lgpl2.1+))) ; with the OCaml static compilation exception (define-public ocaml-stdlib-shims