From patchwork Mon Nov 22 17:37:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 34756 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 1E37427BBE3; Mon, 22 Nov 2021 17:38:28 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 A124227BBE1 for ; Mon, 22 Nov 2021 17:38:27 +0000 (GMT) Received: from localhost ([::1]:60884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpDGs-0005rc-SF for patchwork@mira.cbaines.net; Mon, 22 Nov 2021 12:38:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpDGW-00057v-It for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37483) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpDGW-0008Tu-Az for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpDGW-0007AM-8p for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52039] [PATCH v2 6/7] gnu: Add ocaml-lambda-term. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Nov 2021 17:38:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52039 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52039@debbugs.gnu.org Cc: zimoun Received: via spool by 52039-submit@debbugs.gnu.org id=B52039.163760264927459 (code B ref 52039); Mon, 22 Nov 2021 17:38:04 +0000 Received: (at 52039) by debbugs.gnu.org; 22 Nov 2021 17:37:29 +0000 Received: from localhost ([127.0.0.1]:49022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFw-00078j-G0 for submit@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:28 -0500 Received: from mail-wm1-f47.google.com ([209.85.128.47]:47038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFl-00077M-L4 for 52039@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:18 -0500 Received: by mail-wm1-f47.google.com with SMTP id b184-20020a1c1bc1000000b0033140bf8dd5so466065wmb.5 for <52039@debbugs.gnu.org>; Mon, 22 Nov 2021 09:37:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LSNby+bvo/P0pz2j6s8/Povn19UfHSFR6NsSGiS5uZg=; b=I9WDqOQtqS7XmWdVlJt+k8oqS0Rt3XFkWqScfGT1AR6kaH+SLcJ3Um67DIw/HSXBIx PiaqGPQRal9TTn/vnvNRNekM+YJPx/bFP9c2h5qXXy0WYOglmdVNXseqqfTi3fg38yVx 9WSoJDOBo42X7AafUA3jopLeG1J/b6fg/YroQDOjrs4WSD4wudw9v44gcB84P2XnZBKO MJg6ALGHL+DUJ0frsqHwG62nqHFh9ByvFByV6+B831joMMFLMLN5+28/jtB3PQIbRi2h IQ49VcmUhBKfk2X2jvugg1bq7miwSeNhaifQJmuhDGT6GPA/E0Td01UK6QJFiQZS+TRK hKAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LSNby+bvo/P0pz2j6s8/Povn19UfHSFR6NsSGiS5uZg=; b=gv+TcwrH8LTSoRScluJVJHGsza0tYvgy7e5KrBWRMtgnxGFGWn3kpjYQh/nyyB99CB od/UJ+ai+UGMIF2Wxs3CZEs8i32bB1iGyFw747QaCFDJUndWg/rmxUukwoQdt4jR8Y5V Hl8JpoqTttHZQqvAWROSwyEsM7WRKNA+AMihLh30TfTcrvNLj4m3RKw7IosCk9fXxBOb skSekJW5irkVAmXG+x1RGqJRZuGcptU2/3piEWcUZegB9bcKplasx+QEcD0vaUz3TX+N Qe9OolJ5YXV4ca6JFRewx8PnKGuOYXXXzoAdANoUigHNwh2Kqegq/V70DaS0Q3dLtfWr PkSg== X-Gm-Message-State: AOAM530c/5IWP0jgPiX0mUSRTLOfry/G1DL7+Lzd2XdD2DIxu69+lqGI GIY60YH//emVw5RXsqGgkYpJAJxETPM= X-Google-Smtp-Source: ABdhPJw9IoUlbW4sYrdwt4qlDGKgFNXwH9WIyTdTaXyMSTxq8BDFXWBVVHtuwzeYiFM4Qna26xXp5Q== X-Received: by 2002:a05:600c:4f14:: with SMTP id l20mr30464292wmq.164.1637602632143; Mon, 22 Nov 2021 09:37:12 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id n4sm11763712wri.41.2021.11.22.09.37.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 09:37:11 -0800 (PST) From: zimoun Date: Mon, 22 Nov 2021 18:37:01 +0100 Message-Id: <20211122173702.59732-6-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211122173702.59732-1-zimon.toutoune@gmail.com> References: <20211122173702.59732-1-zimon.toutoune@gmail.com> 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 (ocaml-lambda-term): New variable. (omca4.07-lambda-term): Inherit and adjust. --- gnu/packages/ocaml.scm | 64 ++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9ee443f3af..844d018ded 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4069,31 +4069,32 @@ (define-public ocaml4.07-zed "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55")))) (properties '())))) -(define-public ocaml4.07-lambda-term +(define-public ocaml-lambda-term (package - (name "ocaml4.07-lambda-term") - (version "2.0.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/diml/lambda-term") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0zcjy6fvf0d3i2ssz96asl889n3r6bplyzk7xvb2s3dkxbgcisyy")))) + (name "ocaml-lambda-term") + (version "3.1.0") + (home-page "https://github.com/ocaml-community/lambda-term") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg")))) (build-system dune-build-system) (arguments - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:test-target ".")) (propagated-inputs - `(("ocaml-lwt" ,(package-with-ocaml4.07 ocaml-lwt)) - ("ocaml-lwt-log" ,(package-with-ocaml4.07 ocaml-lwt-log)) - ("ocaml-lwt-react" ,(package-with-ocaml4.07 ocaml-lwt-react)) - ("ocaml-zed" ,ocaml4.07-zed))) - (home-page "https://github.com/diml/lambda-term") + `(("ocaml-lwt" ,ocaml-lwt) + ("ocaml-lwt-log" ,ocaml-lwt-log) + ("ocaml-react" ,ocaml-react) + ("ocaml-zed" ,ocaml-zed) + ("ocaml-camomile" ,ocaml-camomile) + ("ocaml-lwt-react" ,ocaml-lwt-react) + ("ocaml-mew-vi" ,ocaml-mew-vi))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-lambda-term)))) (synopsis "Terminal manipulation library for OCaml") (description "Lambda-Term is a cross-platform library for manipulating the terminal. It provides an abstraction for keys, mouse events, colors, as well as @@ -4103,6 +4104,27 @@ (define-public ocaml4.07-lambda-term instead of bindings to a C library.") (license license:bsd-3))) +(define-public ocaml4.07-lambda-term + (package-with-ocaml4.07 + (package + (inherit ocaml-lambda-term) + (version "2.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml-community/lambda-term") + (commit version))) + (file-name (git-file-name "ocaml4.07-lambda-term" version)) + (sha256 + (base32 "0zcjy6fvf0d3i2ssz96asl889n3r6bplyzk7xvb2s3dkxbgcisyy")))) + (propagated-inputs + `(("ocaml-lwt" ,(package-with-ocaml4.07 ocaml-lwt)) + ("ocaml-lwt-log" ,(package-with-ocaml4.07 ocaml-lwt-log)) + ("ocaml-lwt-react" ,(package-with-ocaml4.07 ocaml-lwt-react)) + ("ocaml-zed" ,ocaml4.07-zed))) + (properties '())))) + (define-public ocaml4.07-utop (package (name "ocaml4.07-utop")