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")