From patchwork Mon Nov 22 17:36:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 34750 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 84A8B27BBE1; Mon, 22 Nov 2021 17:38:13 +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 3AA1D27BBE1 for ; Mon, 22 Nov 2021 17:38:13 +0000 (GMT) Received: from localhost ([::1]:59780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpDGe-00056M-DK for patchwork@mira.cbaines.net; Mon, 22 Nov 2021 12:38:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpDGU-00055i-FF for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37478) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpDGU-0008TK-7G for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpDGU-00079l-59 for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52039] [PATCH v2 1/7] gnu: Add ocaml-trie. References: <20211122153244.51661-1-zimon.toutoune@gmail.com> In-Reply-To: <20211122153244.51661-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Nov 2021 17:38:02 +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.163760264127417 (code B ref 52039); Mon, 22 Nov 2021 17:38:02 +0000 Received: (at 52039) by debbugs.gnu.org; 22 Nov 2021 17:37:21 +0000 Received: from localhost ([127.0.0.1]:49010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFl-00077o-Ae for submit@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:21 -0500 Received: from mail-wr1-f53.google.com ([209.85.221.53]:46918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFj-00077F-4u for 52039@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:16 -0500 Received: by mail-wr1-f53.google.com with SMTP id u1so34119787wru.13 for <52039@debbugs.gnu.org>; Mon, 22 Nov 2021 09:37:15 -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:mime-version :content-transfer-encoding; bh=5aUtAFYu5kET1WF5ZFOEv8LdYOZEMKssbb9/P9TQQTg=; b=OxybUaT0r9trDouLApHtGNOYq71hrCRlepXLQej/Rv+2CH4AsGslmn+pfAA+HUPjnx 4jJEMvIoqLp7rndoDTWSGYlU2Q/z8/G+X58MgqzKhlF63Qw6AREr028ahU+E3IrqHpVM QDFPyFBIkj9RVS5fId+2jYp6NN2Es+laqmPXJWPjUgLk4sIcHcIVkuAUXFhlxXwYzAAN rT1Z0DktsVY2xxnystnKCkc+fG4s+nnf0Hu4EaH/WF0jSMXTvl91PIMPtix0OWD768PE zQ1vLiMVC1MI2/7QmbooM4gebHbb47mz8aW62TbFdIG2aYV6O6/Yv4NBZ9+S6KNgV+dw tc+g== 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:mime-version :content-transfer-encoding; bh=5aUtAFYu5kET1WF5ZFOEv8LdYOZEMKssbb9/P9TQQTg=; b=DCZddDEu/0LL6SXwUyq8Q8MMCOblIni1RJ+rB/s5TFVLGtfbRSfshWx5X8id4u03H+ YINGwXntNXOAMeLRlwX8i7tJ5N+61HilI6BSZSIvijxRVROj91oplhdXzOcNC82Ih5Zi kNmsO9NK26bO4G/HNQPDnJRa3+3Woq6HIsOdYAwPJdYDbJZAHXmwy0LS1WL8EVExx3TP TRw801p8fliRyZIOrF0mT51DlTNK9+Q18Aux9zz2YmtSJb/B0yiHkL58yvjX1m40cqTO XSlY9r7jN+kR/wUKt3GsvxwklMSYHzxbG6wPROf6MHe+NWpKlqi7V9U394JkSYJalIM6 sNUQ== X-Gm-Message-State: AOAM531rg5gve0q7+nVtUJsU9tFIOkV+5Ki8EjWgCCWfr7nLte725DLF OuZpJvCKmsl1GhG7HbV7kEXkixcJSHg= X-Google-Smtp-Source: ABdhPJzZ6NxDEB94UaDQ98lkZGTCeEOfbHtAB09+Nwo/Cwtfre6byO8u+fEKjJCRTKpr70QKvT608w== X-Received: by 2002:a05:6000:1541:: with SMTP id 1mr39303425wry.347.1637602629104; Mon, 22 Nov 2021 09:37:09 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id n4sm11763712wri.41.2021.11.22.09.37.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 09:37:08 -0800 (PST) From: zimoun Date: Mon, 22 Nov 2021 18:36:56 +0100 Message-Id: <20211122173702.59732-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 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-trie): New variable. --- gnu/packages/ocaml.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) base-commit: 9d370029c21487c54b7bda4aa53e49251107a71f diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 123f05d568..5e195572ec 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2020 Simon Tournier +;;; Copyright © 2020, 2021 Simon Tournier ;;; Copyright © 2020 divoplade ;;; Copyright © 2020, 2021 pukkamustard ;;; Copyright © 2021 aecepoglu @@ -7434,6 +7434,29 @@ (define-public ocaml-bigstringaf these missing pieces.") (license license:bsd-3))) +(define-public ocaml-trie + (package + (name "ocaml-trie") + (version "1.0.0") + (home-page "https://github.com/kandu/trie/") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0s7p9swjqjsqddylmgid6cv263ggq7pmb734z4k84yfcrgb6kg4g")))) + (build-system dune-build-system) + (arguments + '(#:tests? #f)) ;no tests + (synopsis "Strict impure trie tree") + (description + "This module implements strict impure trie tree data structure for +OCaml.") + (license license:expat))) + (define-public ocaml-syntax-shims (package (name "ocaml-syntax-shims") From patchwork Mon Nov 22 17:36:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 34752 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 30F1727BBE3; Mon, 22 Nov 2021 17:38:17 +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 0228F27BBE1 for ; Mon, 22 Nov 2021 17:38:17 +0000 (GMT) Received: from localhost ([::1]:59876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpDGi-0005At-6n for patchwork@mira.cbaines.net; Mon, 22 Nov 2021 12:38:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpDGV-00055y-7t for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37480) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpDGV-0008TW-0E for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpDGU-0007A0-Ui for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52039] [PATCH v2 2/7] gnu: Add ocaml-mew. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Nov 2021 17:38:02 +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.163760264127432 (code B ref 52039); Mon, 22 Nov 2021 17:38:02 +0000 Received: (at 52039) by debbugs.gnu.org; 22 Nov 2021 17:37:21 +0000 Received: from localhost ([127.0.0.1]:49016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFp-00078H-FD for submit@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:21 -0500 Received: from mail-wm1-f41.google.com ([209.85.128.41]:34535) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFj-00077G-My for 52039@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:16 -0500 Received: by mail-wm1-f41.google.com with SMTP id ay10-20020a05600c1e0a00b0033aa12cdd33so320673wmb.1 for <52039@debbugs.gnu.org>; Mon, 22 Nov 2021 09:37:15 -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=jHV52mNN28WaY5/e6U7lGr6ql8cXPeVhoSGlL1lEj6w=; b=LNEFtG0Ei6qUgV0apcXenVv4RhH1oDwwLcRMCD3xC9Ypgk3SsHtUy2rgEqM+QocwYM EYjaBaGkVREfw4RBPhoVCeF44fb2Y2+g5qjV4DmZ5bUGqknTl/FNDwiaMuE4KxTTOwRT yRsweebN0GtaSkVz2+kl2rIp2wuAkivMLqZ3yJNNaqF712tCL55HFBUbhk0qMt6HqWbB oiopqziJpSMEYRZy+76Uo74YA43YOQpw2ESDS2PzAz8Yo8hgd1LKEqVcXxbpwxCIX2yB W4A0zXJM9+4S4H3DzOV/PCLFrrDTC6Pimu6TS6gfG+zSEnqGOglJ3GKqpLG08CsDxKik vwnQ== 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=jHV52mNN28WaY5/e6U7lGr6ql8cXPeVhoSGlL1lEj6w=; b=wvGQ3Az/2H45PP70oGBJwLYAkx3hg7qsCASI+nHS5/uaHs83DKMz0fe135egvJc1TB Uw5wRBuQHjK20V8OgIo/eAaiK1vee0YUP+jSEUiB8SvzaCVkjp0HHu0x7tRDcT/G/oOo 4BllnTIs7/LlFxPZdjaEALhUToNQUBjkGZg7A8eBPFHYkkSSCtk17MrRX0MyLQ7ARufI 7pGiy4VbyMQCOMGi37mu2bhmv9F83fnco215NsyMrZuJY9DpqrlDJvFs0MeDOm8FgoiA WOvXZef0wGcu8lKW3q6RIfAKjNaDLjuCZCiiy/PXczAo9bjPRhrLvlMF3yaH73nJXSgN e7Vw== X-Gm-Message-State: AOAM531SiThqJ3CENlavWhTTvoM/VOu4al28IODOitOYanVX3L5w4x+K bdGZTPqR8JcCjSER037akGpCAQRvjnU= X-Google-Smtp-Source: ABdhPJwM7WpcH1/AICNZJeL1NlnCh57HvEtTqkWXKCbdyVEY5o/E75jTcjQVMzNApgyv+jq9nmb7lw== X-Received: by 2002:a1c:7ed3:: with SMTP id z202mr30969190wmc.110.1637602629820; Mon, 22 Nov 2021 09:37:09 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id n4sm11763712wri.41.2021.11.22.09.37.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 09:37:09 -0800 (PST) From: zimoun Date: Mon, 22 Nov 2021 18:36:57 +0100 Message-Id: <20211122173702.59732-2-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-mew): New variable. --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5e195572ec..427ee2c682 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7457,6 +7457,32 @@ (define-public ocaml-trie OCaml.") (license license:expat))) +(define-public ocaml-mew + (package + (name "ocaml-mew") + (version "0.1.0") + (home-page "https://github.com/kandu/mew") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0417xsghj92v3xa5q4dk4nzf2r4mylrx2fd18i7cg3nzja65nia2")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-result" ,ocaml-result) + ("ocaml-trie" ,ocaml-trie))) + (native-inputs + `(("ocaml-ppx-expect" ,ocaml-ppx-expect))) + (synopsis "General modal editing engine generator") + (description + "This package provides the core modules of Modal Editing Witch, a general +modal editing engine generator.") + (license license:expat))) + (define-public ocaml-syntax-shims (package (name "ocaml-syntax-shims") From patchwork Mon Nov 22 17:36:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 34753 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 D2E4E27BBE3; Mon, 22 Nov 2021 17:38:21 +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 9F3F027BBE1 for ; Mon, 22 Nov 2021 17:38:21 +0000 (GMT) Received: from localhost ([::1]:60270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpDGm-0005SK-Oe for patchwork@mira.cbaines.net; Mon, 22 Nov 2021 12:38:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpDGU-00055q-S1 for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37479) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpDGU-0008TQ-KB for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpDGU-00079s-Ht for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52039] [PATCH v2 3/7] gnu: Add ocaml-mew-vi. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Nov 2021 17:38:02 +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.163760264127424 (code B ref 52039); Mon, 22 Nov 2021 17:38:02 +0000 Received: (at 52039) by debbugs.gnu.org; 22 Nov 2021 17:37:21 +0000 Received: from localhost ([127.0.0.1]:49014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFp-00078A-6r for submit@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:21 -0500 Received: from mail-wr1-f45.google.com ([209.85.221.45]:37545) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFk-00077I-0G for 52039@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:16 -0500 Received: by mail-wr1-f45.google.com with SMTP id b12so34140104wrh.4 for <52039@debbugs.gnu.org>; Mon, 22 Nov 2021 09:37:15 -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=XIjfcfBaUJyQYG2lKvDVh12eNLDyY+XzSA8von65hiA=; b=WGYZu6l5Y9ADFgKgXv04D6M2p9iN/Pi/EDRoyo6FnMrhPQPcinuXZ8lV5kPgBuERb7 RRvJZ55piOeacIqMmn470nibnjp5Q1R5oBLBhhn55P1Vul2PPVjvTFNT6JXU/MNnmWyH KaW17Ni4UjgX4005Pya620Bp8HGyHqEkYTouvjB+nqlgteLslqqo5+LOBk33Chjs38xT QtebT/pB4YePsKc7cXl8x201P6OswJgcNSldwD4MiZZKlXce8RFoEOzdJI+MZopml9Yr lsEEEZa7JYl70PRyVwMFoIZxVKgDH4B6To/kG7dGL8pBd7jcLZ9m18gBKFmS6q2cbt5g bsFw== 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=XIjfcfBaUJyQYG2lKvDVh12eNLDyY+XzSA8von65hiA=; b=h0lKpJLLKtxe6/ZgSjwsw6YeeqDnNeMlzy1XFRSn8CL5gdQFQ7wf0YZ1gjQiongmaQ mj7YuW1vSORdd1aTzZx7hkacnnd/dq5Vh8xP9NucvAWAYEgYo1lN1mmniPe11BOCxQ// UmTY69KlX9Z7Hp6JOK88q2637Wk0nm5T2BqhtrDFROwHbVEp3qUuMYM9ONlMV4sJa8No 6ePzlY+NV/WOAS0+FJQJhV8+2EYZbNdmSnNw2TPr7hkvnlKEwHfa9vyifDKbAcAgSnQD 2KZbwqmjFdxZIywwkppfCGaFlayGsntWc/Oj4xiDkL/cMBTVQDlg8GdWtFhMhnH+jk26 Eiew== X-Gm-Message-State: AOAM531xq9eUv+lG61gGlV6CpDZqd/YP1EaE5ONLZUAe1Ig/Z6ksDB4I F5CdZorMLlSXzKUhl5hCxgOwkaScJ7E= X-Google-Smtp-Source: ABdhPJxQgGSbpzqiw26d7UjFMAJ3StaT26tYyXTsziLpB8lje3bTCJ0S0x+vPpf2tl2U4r96ZeDs6A== X-Received: by 2002:adf:ef4f:: with SMTP id c15mr40451298wrp.226.1637602630423; Mon, 22 Nov 2021 09:37:10 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id n4sm11763712wri.41.2021.11.22.09.37.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 09:37:10 -0800 (PST) From: zimoun Date: Mon, 22 Nov 2021 18:36:58 +0100 Message-Id: <20211122173702.59732-3-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-mew-vi): New variable. --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 427ee2c682..82670fec7f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7483,6 +7483,32 @@ (define-public ocaml-mew modal editing engine generator.") (license license:expat))) +(define-public ocaml-mew-vi + (package + (name "ocaml-mew-vi") + (version "0.5.0") + (home-page "https://github.com/kandu/mew_vi") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0lihbf822k5zasl60w5mhwmdkljlq49c9saayrws7g4qc1j353r8")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-mew" ,ocaml-mew) + ("ocaml-react" ,ocaml-react))) + (native-inputs + `(("ocaml-ppx-expect" ,ocaml-ppx-expect))) + (properties `((upstream-name . "mew_vi"))) + (synopsis "Modal editing VI-like editing engine generator") + (description "This module provides a vi-like modal editing engine +generator.") + (license license:expat))) + (define-public ocaml-syntax-shims (package (name "ocaml-syntax-shims") From patchwork Mon Nov 22 17:36:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 34751 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 7758527BBE3; Mon, 22 Nov 2021 17:38:16 +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=-1.1 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,URIBL_SBL,URIBL_SBL_A 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 3B45527BBE1 for ; Mon, 22 Nov 2021 17:38:16 +0000 (GMT) Received: from localhost ([::1]:59822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpDGh-00058a-CO for patchwork@mira.cbaines.net; Mon, 22 Nov 2021 12:38:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpDGV-000569-Mu for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37481) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpDGV-0008Te-F3 for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpDGV-0007A7-CU for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52039] [PATCH v2 4/7] gnu: ocaml-charinfo-width: Fix source to get 'LICENSE' file. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Nov 2021 17:38:03 +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.163760264227438 (code B ref 52039); Mon, 22 Nov 2021 17:38:03 +0000 Received: (at 52039) by debbugs.gnu.org; 22 Nov 2021 17:37:22 +0000 Received: from localhost ([127.0.0.1]:49018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFp-00078O-P5 for submit@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:22 -0500 Received: from mail-wr1-f49.google.com ([209.85.221.49]:43572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFk-00077J-FU for 52039@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:17 -0500 Received: by mail-wr1-f49.google.com with SMTP id t30so34076297wra.10 for <52039@debbugs.gnu.org>; Mon, 22 Nov 2021 09:37:16 -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=bvo9PfC3ZyAVINK8SNVRmKxF3GEHOX58M7tRJgvzYlM=; b=fFM9b+RQUVXf/UnZVVnKgdJ4mF5SbYGsqHPEcTO4pC9IASyJYFy0842VrGhxdwqFLr ZlRjVusn3jxOeMLtDaKU/nqZqHy6HpNMRLEWPygJ7t48LUfPuSd4KtkzCwg9QsLWONik 3lZrsVhRXNqS1fooYdan/4i7r+9F7qXygH8mY267V7656K9oV1KaiOf9PSnwgPR9h0oF UgpNRhi+aZtMx8XH6vPBAIYduY/3VdDjBYxWoG0FZygijuyN6aEELZHMmsDKKbeOnEFP Xo9TbS55q4dB1kCDObbwkHI2LAB75seH0KX4bixy6413QyaVSGovXVBx0IR6gMLrh6eu K9jw== 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=bvo9PfC3ZyAVINK8SNVRmKxF3GEHOX58M7tRJgvzYlM=; b=aoeqJAgua/JMVmJHjo08TSdH6bqfS6nD58bFrN1E9zW1oOehgNZbTVRh89RDLnJh+D P8XUtZGvvgNn748863jcIu7h4PU2EVcsrGSiq8bKCccxwzwINHNluUAt2gJoyvHvGAQK v577gRwQsRZTQXZwv3xZcfYmw2bmtDsehcbYOeSU9t9od512lUljN+vaDHNtZCTMUkgp iGnjjBNUxNrxUgheTuyHzc11JE+vS6d+OtvC7PLZ8geL7Wty7e1ztoLnN1WdkVC2QWGx QwR//Hrr4SaS41KMbXHyRDQJYSfXEYkqlgW7fYE2P1pdCIdLWqIT2Ct/nF/3k7n8GH4h /Kiw== X-Gm-Message-State: AOAM530ygNwteHsrooD8sS33e6vg5WoeTXLjG+mY6Hw7DnwcmqczJ+tw AOxCUTZH48dv56HgzWNVnHseuQ1pshA= X-Google-Smtp-Source: ABdhPJw2BiqsW6FeH30mATq92OFPmEoAeV2cVfZruv7EcehmyXGDfM4Dt5A3cxSGnH5ZFaYeNlWMwQ== X-Received: by 2002:adf:dec9:: with SMTP id i9mr40780535wrn.18.1637602630888; Mon, 22 Nov 2021 09:37:10 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id n4sm11763712wri.41.2021.11.22.09.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 09:37:10 -0800 (PST) From: zimoun Date: Mon, 22 Nov 2021 18:36:59 +0100 Message-Id: <20211122173702.59732-4-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-charinfo-width): Replace 'url-fetch' by 'git-fetch' and update to unreleased commit. --- gnu/packages/ocaml.scm | 49 ++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 82670fec7f..92ace48abb 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3992,30 +3992,33 @@ (define-public ocaml-camomile (license license:lgpl2.0+))) (define-public ocaml-charinfo-width - (package - (name "ocaml-charinfo-width") - (version "1.1.0") - (source (origin - (method url-fetch) - (uri (string-append "https://bitbucket.org/zandoye/charinfo_width" - "/get/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "00bv4p1yqs8y0z4z07wd9w9yyv669dikp9b04dcjbwpiy2wy0086")))) - (build-system dune-build-system) - (propagated-inputs - `(("ocaml-result" ,ocaml-result) - ("ocaml-camomile" ,ocaml-camomile))) - (native-inputs - `(("ocaml-ppx-expect" ,ocaml-ppx-expect))) - (properties - `((upstream-name . "charInfo_width"))) - (home-page "https://bitbucket.org/zandoye/charinfo_width/") - (synopsis "Determine column width for a character") - (description "This module is implements purely in OCaml a character width + ;; Add LICENSE file and Dune tests + (let ((commit "20aaaa6dca8f1e0b1ace55b6f2a8ba5e5910b620")) + (package + (name "ocaml-charinfo-width") + (version (git-version "1.1.0" "1" commit)) + (home-page "https://github.com/kandu/charinfo_width/") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04gil5hxm2jax9paw3i24d8zyzhyl5cphzfyryvy2lcrm3c485q0")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-result" ,ocaml-result) + ("ocaml-camomile" ,ocaml-camomile))) + (native-inputs + `(("ocaml-ppx-expect" ,ocaml-ppx-expect))) + (properties + `((upstream-name . "charInfo_width"))) + (synopsis "Determine column width for a character") + (description "This module is implements purely in OCaml a character width function that follows the prototype of POSIX's wcwidth.") - (license license:expat))) + (license license:expat)))) (define-public ocaml4.07-zed (package From patchwork Mon Nov 22 17:37:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 34754 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 4055227BBE1; Mon, 22 Nov 2021 17:38:24 +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 3A29827BBE4 for ; Mon, 22 Nov 2021 17:38:23 +0000 (GMT) Received: from localhost ([::1]:60418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpDGo-0005Xy-E0 for patchwork@mira.cbaines.net; Mon, 22 Nov 2021 12:38:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpDGW-00056y-5R for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37482) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpDGV-0008Tk-TX for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpDGV-0007AE-QQ for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52039] [PATCH v2 5/7] gnu: Add ocaml-zed. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Nov 2021 17:38:03 +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.163760264827452 (code B ref 52039); Mon, 22 Nov 2021 17:38:03 +0000 Received: (at 52039) by debbugs.gnu.org; 22 Nov 2021 17:37:28 +0000 Received: from localhost ([127.0.0.1]:49020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFw-00078g-4K for submit@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:28 -0500 Received: from mail-wm1-f47.google.com ([209.85.128.47]:44678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFl-00077L-5O for 52039@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:17 -0500 Received: by mail-wm1-f47.google.com with SMTP id c71-20020a1c9a4a000000b0032cdcc8cbafso469379wme.3 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=uRcBgEZP5CMAGcWIOZqvno2EXT06jq5bmTYDhipx8DQ=; b=DAC2lC/VY9ckRCJTPF4dWGCkmN2SiG177GA75giaN/Coq8HeRlOJyy5d7NgOSX4PVF u+Czp79Lys6ispWxFDG8is2ghElNlLLv4fe6INFIsmLzNw3E4/gcaSbkgwx8L7f4RIam B/OGc+Kc31a0LF9HZmdvOUotIrsay2M55CbdiQHzcolFZirjFXw7cVwzzGAv0Wx+0Gmk qwh9D9lyovS46QzX4Zi8kBSjeTpu/t+IT+PlLfHOcbS/BaUmpoLuaFqx3R204eW2xBw8 o5MdLNNl3tdETerIhiR/y+iJsmO9L4Ndiy3jUR1X6OYRs6wHWMr+GnC9dUGG4zRtzxge /mbA== 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=uRcBgEZP5CMAGcWIOZqvno2EXT06jq5bmTYDhipx8DQ=; b=ySyFswfWu0WXbjLkrkzm3yTOviu56SPeNxihOQeI8RxoKHPUOo1p1gECGgeuEvaJ3w Se+KkTOkNcj1m7xUMdNnTCGGfeFbxuscESSl85KJDJ81u4kKF/8oBCfdzZ7XSTXZG5+o p524s11mVCx6gxDXjYwRYzH+DJDpCUBlr2EZ9tFpP/PmOcHF7lKiM6qfrvgQ9bS8b+Sd NWEFmdcLpf1Qy2CAG/4ODl7JSK417votmVFsQ2/2Tbj9e7d7YBhBRxuqW+gXEfrm/Jma j2vAKmSqYbIOqcbHIZri6PTdzkZzqvYV1Xmg/SrOtw6wKVobXRL3jPxcEbqjYGHA5zrN cslA== X-Gm-Message-State: AOAM531yDbXHw8YSOUSRnTzE2dxyXB6X5eT2fM15zFUQt2LwF/ARfOwe wiJ0nj+Dr+ZoTV3ooLaYWcDbsKAkPz8= X-Google-Smtp-Source: ABdhPJwiXRc/4jbylRtwf/48B3AsAZxNGkCL/RtBN3twLKXOjZ9j9YMQ9k6eZ4ss5XX4D0nTa+UQVg== X-Received: by 2002:a05:600c:a05:: with SMTP id z5mr31582242wmp.73.1637602631445; Mon, 22 Nov 2021 09:37:11 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id n4sm11763712wri.41.2021.11.22.09.37.10 (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:00 +0100 Message-Id: <20211122173702.59732-5-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-zed): New variable. (ocaml4.07-zed): Inherit and adjust source. --- gnu/packages/ocaml.scm | 53 ++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 92ace48abb..9ee443f3af 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4020,36 +4020,55 @@ (define-public ocaml-charinfo-width function that follows the prototype of POSIX's wcwidth.") (license license:expat)))) -(define-public ocaml4.07-zed +(define-public ocaml-zed (package - (name "ocaml4.07-zed") - (version "2.0.3") + (name "ocaml-zed") + (version "3.1.0") + (home-page "https://github.com/ocaml-community/zed") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/diml/zed") + (url home-page) (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55")))) + (base32 "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:test-target ".")) (propagated-inputs - `(("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)) - ("ocaml-charinfo-width" ,(package-with-ocaml4.07 ocaml-charinfo-width)) - ("ocaml-react" ,(package-with-ocaml4.07 ocaml-react)))) - (home-page "https://github.com/diml/zed") - (synopsis "Abstract engine for text editing in OCaml") - (description "Zed is an abstract engine for text edition. It can be used -to write text editors, edition widgets, readlines, etc. You just have to -connect an engine to your inputs and rendering functions to get an editor.") + `(("ocaml-charInfo-width" ,ocaml-charinfo-width) + ("ocaml-camomile" ,ocaml-camomile) + ("ocaml-react" ,ocaml-react))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-zed)))) + (synopsis "Abstract engine for text edition in OCaml") + (description + "This module provides an abstract engine for text edition. It can be +used to write text editors, edition widgets, readlines, and more. The module +Zed uses Camomile to fully support the Unicode specification, and implements +an UTF-8 encoded string type with validation, and a rope datastructure to +achieve efficient operations on large Unicode buffers. Zed also features a +regular expression search on ropes. To support efficient text edition +capabilities, Zed provides macro recording and cursor management facilities.") (license license:bsd-3))) +(define-public ocaml4.07-zed + (package-with-ocaml4.07 + (package + (inherit ocaml-zed) + (version "2.0.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml-community/zed") + (commit version))) + (file-name (git-file-name "ocaml4.07-zed" version)) + (sha256 + (base32 + "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55")))) + (properties '())))) + (define-public ocaml4.07-lambda-term (package (name "ocaml4.07-lambda-term") 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") From patchwork Mon Nov 22 17:37:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 34755 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 6F71627BBE3; Mon, 22 Nov 2021 17:38:25 +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 0438327BBE1 for ; Mon, 22 Nov 2021 17:38:25 +0000 (GMT) Received: from localhost ([::1]:60488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpDGq-0005bE-8G for patchwork@mira.cbaines.net; Mon, 22 Nov 2021 12:38:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpDGX-00058v-0t for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37484) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpDGW-0008U3-OW 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-0007AT-MA for guix-patches@gnu.org; Mon, 22 Nov 2021 12:38:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52039] [PATCH v2 7/7] gnu: Add ocaml-utop. 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.163760264927465 (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]:49024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFw-00078q-T9 for submit@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:29 -0500 Received: from mail-wm1-f47.google.com ([209.85.128.47]:54130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpDFm-00077O-9b for 52039@debbugs.gnu.org; Mon, 22 Nov 2021 12:37:18 -0500 Received: by mail-wm1-f47.google.com with SMTP id y196so16192307wmc.3 for <52039@debbugs.gnu.org>; Mon, 22 Nov 2021 09:37:18 -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=bF5Cvym3PvCIHGtYYP/HGEbOV7JZygpkDuTax8MweDY=; b=JiJNdEYv7GU3nkDnonxSdIDWRsL7wXlJG1JuUu5JTB3raATr32Uyoy4nl8fkwyq9Kv psN0ZaRt79ExDCiMjRneqgndBT18aAaKE8yCHi/u90/gK5rlkNhG86/itCszz3W7nP3a E2iXAEYHCv0d9YdE0V61Lpza12aEGbEx8RPBORbqUDrzMxq+JG63fIMzY/Ed8fAttMnh v/Itgyr/7W3ZbJbAwA5MdOTJ9Ef34uXAZ2+98GpZabpxBkw2WtcvPyrNMamaWHKRiPid DF5QVEe5ZcN+nk1IFy4qcFTcmeCARTrHcFdpZovf/e474wG4wJukU4Nw3FrMiT8cX9l1 SCkQ== 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=bF5Cvym3PvCIHGtYYP/HGEbOV7JZygpkDuTax8MweDY=; b=ToY0vhhdL8gjZT0yPPY64SKmo2uype1ApRS1i9pJsz2UwLdnvPVfUZiUfks5ia5Rs5 HkcrQKUbdE4H1v2sLu8nwirXZuYS3GKoFV/9z93prvw6PnXVLJPbuWDyL60QUigzxSHx KDCuFT2cU07EsmfL/tSgvyW2Idw5MfFnie7OzpfbXDYHJnHB8NdZQFc8Lko2TcPklrN/ QG3/LvQwHCQtzKXqsSZpdFrOzslXE97Bfq1t5SUvE3RPF2+vkTqBLFMlNG1jFCXG2yRW nINq1PSOBv9ix6U9Fc5rHZLq1djqoFBoxNlX0pBt8N5wt2WtbGgdMthUKE0Hw5ZoANKF csew== X-Gm-Message-State: AOAM5313tHhYPyd671QyNB5/gpot4WXe7pt3PJBuQbBK3HjkelgLP8Z2 Trn6D0SuOfxJRu7S+ow7AuriOWabMk4= X-Google-Smtp-Source: ABdhPJzLeEEtO+iqKpmn8qleE+fsfT9jOGyikXDuf9VOQu2izdYVf7KJ8RzHEF5ezZ6xCOTHiKu49w== X-Received: by 2002:a05:600c:21c3:: with SMTP id x3mr31041819wmj.13.1637602632799; 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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 09:37:12 -0800 (PST) From: zimoun Date: Mon, 22 Nov 2021 18:37:02 +0100 Message-Id: <20211122173702.59732-7-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-utop): New variable. (ocaml4.07-utop): Inherit and adjust. --- gnu/packages/ocaml.scm | 52 +++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 844d018ded..0551aec589 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4125,40 +4125,60 @@ (define-public ocaml4.07-lambda-term ("ocaml-zed" ,ocaml4.07-zed))) (properties '())))) -(define-public ocaml4.07-utop +(define-public ocaml-utop (package - (name "ocaml4.07-utop") - (version "2.4.3") + (name "ocaml-utop") + (version "2.8.0") + (home-page "https://github.com/ocaml-community/utop") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ocaml-community/utop") + (url home-page) (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp")))) + (base32 "1zf4hg33sblzh2f65vk0292jg4jlwa8702kfwpsg1kcg4w6nsfdp")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + '(#:test-target ".")) (native-inputs - `(("cppo" ,(package-with-ocaml4.07 ocaml-cppo)))) + `(("ocaml-cppo" ,ocaml-cppo))) (propagated-inputs - `(("lambda-term" ,ocaml4.07-lambda-term) - ("lwt" ,(package-with-ocaml4.07 ocaml-lwt)) - ("react" ,(package-with-ocaml4.07 ocaml-react)) - ("camomile" ,(package-with-ocaml4.07 ocaml-camomile)) - ("zed" ,ocaml4.07-zed))) - (home-page "https://github.com/ocaml-community/utop") + `(("ocaml-lambda-term" ,ocaml-lambda-term) + ("ocaml-lwt" ,ocaml-lwt) + ("ocaml-lwt-react" ,ocaml-lwt-react) + ("ocaml-camomile" ,ocaml-camomile) + ("ocaml-react" ,ocaml-react))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-utop)))) (synopsis "Improved interface to the OCaml toplevel") (description "UTop is an improved toplevel for OCaml. It can run in a terminal or in Emacs. It supports line editing, history, real-time and context sensitive completion, colors, and more.") (license license:bsd-3))) +(define-public ocaml4.07-utop + (package-with-ocaml4.07 + (package + (inherit ocaml-utop) + (version "2.4.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml-community/utop") + (commit version))) + (file-name (git-file-name "ocaml4.07-utop" version)) + (sha256 + (base32 "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp")))) + (propagated-inputs + `(("lambda-term" ,ocaml4.07-lambda-term) + ("lwt" ,(package-with-ocaml4.07 ocaml-lwt)) + ("react" ,(package-with-ocaml4.07 ocaml-react)) + ("camomile" ,(package-with-ocaml4.07 ocaml-camomile)) + ("zed" ,ocaml4.07-zed))) + (properties '())))) + (define-public ocaml-integers (package (name "ocaml-integers")