From patchwork Sat Jun 19 09:03:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 30461 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 0675127BC81; Sat, 19 Jun 2021 10:04:19 +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 B4C9327BC78 for ; Sat, 19 Jun 2021 10:04:18 +0100 (BST) Received: from localhost ([::1]:33516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luWtl-0005WV-Oh for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 05:04:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luWtW-0005Ts-EY for guix-patches@gnu.org; Sat, 19 Jun 2021 05:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47004) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luWtW-00041U-6J for guix-patches@gnu.org; Sat, 19 Jun 2021 05:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luWtW-0007l7-3r for guix-patches@gnu.org; Sat, 19 Jun 2021 05:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49101] [PATCH v2 1/5] gnu: ocaml4.07-pcre: 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 09:04:02 +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 Received: via spool by 49101-submit@debbugs.gnu.org id=B49101.162409343029763 (code B ref 49101); Sat, 19 Jun 2021 09:04:02 +0000 Received: (at 49101) by debbugs.gnu.org; 19 Jun 2021 09:03:50 +0000 Received: from localhost ([127.0.0.1]:58539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luWtK-0007jy-IP for submit@debbugs.gnu.org; Sat, 19 Jun 2021 05:03:50 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:40542 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luWtG-0007jG-7V for 49101@debbugs.gnu.org; Sat, 19 Jun 2021 05:03:48 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1624093419; bh=vkIKOL+tbica7GSOx15TxBoCcvKJIAq8aY86LJ+SQRQ=; h=From:To:Subject:In-Reply-To:References:Date; b=mEslZ1ODEZ5Wk5hm2vFGsA9/PkMPnWbg8ouiWOQwv4GFsB7cwkCJ8KvlaPTaXKIgH x4FHuZOnKqBqE0zhafKoHSk0RtEIUt6/93/PNbh611cvNtycPI51BpyLPk/liL47Md sPWRXKp8Qdj+9pXwZs7x2Xv8vxqrfkBLRvRjmiKg= In-Reply-To: References: Message-Id: <297c3da0df390937b17eb9fceb33202a25bf1f34.1624093132.git.public@yoctocell.xyz> Date: Sat, 19 Jun 2021 11:03:39 +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-pcre): Rename to ‘ocaml-pcre’. [version]: Update to latest version. [arguments]: Use default OCaml compiler. [native-inputs]: Adjust accordingly. [propagated-inputs]: Likewise. --- gnu/packages/ocaml.scm | 50 ++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a8432ebbfe..e02684fefd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3086,35 +3086,37 @@ every compliant installation of OCaml and organize these libraries into a hierarchy of modules.") (license license:lgpl2.1+))) -(define-public ocaml4.07-pcre +(define-public ocaml-pcre (package - (name "ocaml4.07-pcre") - (version "7.4.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mmottl/pcre-ocaml") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "11sd8g668h48790lamz0riw9jgnfkaif5qdfa0akcndwa6aj07jf")))) + (name "ocaml-pcre") + (version "7.4.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mmottl/pcre-ocaml") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11mck879p5zvkghps4ky8yslm0isgz52d84adl0dmcfxv2ibvcym")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + ;; No tests. + '(#:tests? #f)) + (propagated-inputs + `(("dune-configurator" ,dune-configurator) + ("pcre" ,pcre))) (native-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("pcre:bin" ,pcre "bin"))) - (propagated-inputs `(("pcre" ,pcre))) + `(("pcre:bin" ,pcre "bin"))) (home-page "https://mmottl.github.io/pcre-ocaml") - (synopsis "Bindings to the Perl Compatibility Regular Expressions library") - (description "Pcre-ocaml offers library functions for string pattern -matching and substitution, similar to the functionality offered by the Perl -language.") - (license license:lgpl2.1+))); with the OCaml link exception + (synopsis + "Bindings to the Perl Compatibility Regular Expressions library") + (description "pcre-ocaml offers library functions for string +pattern matching and substitution, similar to the functionality +offered by the Perl language.") + ;; With static linking exception + (license license:lgpl2.1+))) (define-public ocaml4.07-expect (package