From patchwork Mon Nov 22 15:35:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 34745 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 2186227BBE3; Mon, 22 Nov 2021 15:36:49 +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 DC9D527BBE1 for ; Mon, 22 Nov 2021 15:36:48 +0000 (GMT) Received: from localhost ([::1]:51222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpBNA-0005br-22 for patchwork@mira.cbaines.net; Mon, 22 Nov 2021 10:36:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpBMT-0004nq-E1 for guix-patches@gnu.org; Mon, 22 Nov 2021 10:36:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37352) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpBMT-0005bY-5j for guix-patches@gnu.org; Mon, 22 Nov 2021 10:36:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpBMT-0001cK-3I for guix-patches@gnu.org; Mon, 22 Nov 2021 10:36:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52039] [PATCH 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 15:36:05 +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.16375953496139 (code B ref 52039); Mon, 22 Nov 2021 15:36:05 +0000 Received: (at 52039) by debbugs.gnu.org; 22 Nov 2021 15:35:49 +0000 Received: from localhost ([127.0.0.1]:48888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpBM6-0001af-V5 for submit@debbugs.gnu.org; Mon, 22 Nov 2021 10:35:49 -0500 Received: from mail-wm1-f50.google.com ([209.85.128.50]:45041) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpBM1-0001ZE-Ot for 52039@debbugs.gnu.org; Mon, 22 Nov 2021 10:35:38 -0500 Received: by mail-wm1-f50.google.com with SMTP id c71-20020a1c9a4a000000b0032cdcc8cbafso165480wme.3 for <52039@debbugs.gnu.org>; Mon, 22 Nov 2021 07:35:37 -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=/ziNkJttlk1tSOWec/IQ+sYC2+2XF/aTBfCZXN7GMu4=; b=BnI6KUsntYdxP5AzdQvm7/fNWAXKtmIeMb0C9fXwzXx1ZsLNlydfjVjlbfIsKI10DH Pu7QmEwAcNnTCE7O/Dzw+41DlUVzTXvj1Ugm1JXrv60AiOn11JgDQGpP95slihoa+hQ7 NbgiU2puL4nm1OzMa8PmHUlMmqFKCRRsfiznqZfe++Wxf7JNzFkqqpWNVpQr8AjvzQBM 3wIwX7t9Sss8FBLB9a4IjbC6A2OItsOFDKefg62rFBe76BPVNYC9zhrxeuzVuW8CBoCf ywEuymUCNqd/yWdSZNzMabuoRorUtE9zRYNXrnvttqZb0jnXbpGFmNHautrdrRwEgcqU UOjA== 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=/ziNkJttlk1tSOWec/IQ+sYC2+2XF/aTBfCZXN7GMu4=; b=7bgdpcaIYawTFk+WkRFTqkqtoCVhakhuq0AWmTn19HqtnguzL/GPtU3SAP7X8WYQ+e /E3Ja4lnVkSWkjpZHHIYBePrIdQKLn1lb5ieU0kwKdcKnnsTENnjCACQw8wO3T4YBTJo EW9ImaPKRCZm13FBkJWKkomQTCKpM0jupLHyLuRXtssKNtw8MHD1YNkfBgleaFGsonG7 3WAmA2rmDqlAPKbqNXmlQ8aKzB3fEhDVbFrwwPYYX42uQvrXtd3lU83PtUNoZRcquebQ SaL47aaxAFReIpKpcbWBuUj/mTFLmD1HcZ85j1B0VB6JzNK9stRiaGg93kBmCtIHnWe0 Jzqg== X-Gm-Message-State: AOAM531VCGSpsZGSZNnOPzJGPufzJXpTd9iF1aDQUoE1OCIkpyZ7IGYG Zrf2qpO9h3ePiedkKGx/71oF/xANCxs= X-Google-Smtp-Source: ABdhPJxvEDKwfFgMd9E+B+3xJVP2KM6MB5DZmGwNfN7hhfeK/SrAO6PaLdS8bhoauy8jbnIGmpULLQ== X-Received: by 2002:a05:600c:1d01:: with SMTP id l1mr31252267wms.44.1637595332114; Mon, 22 Nov 2021 07:35:32 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id o9sm9409147wrs.4.2021.11.22.07.35.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 07:35:31 -0800 (PST) From: zimoun Date: Mon, 22 Nov 2021 16:35:26 +0100 Message-Id: <20211122153526.51833-7-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211122153526.51833-1-zimon.toutoune@gmail.com> References: <20211122153526.51833-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 | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f63a00f1d8..8d72641bfd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4136,8 +4136,40 @@ (define-public ocaml4.07-lambda-term ("ocaml-lwt-react" ,(package-with-ocaml4.07 ocaml-lwt-react)) ("ocaml-zed" ,ocaml4.07-zed))))) +(define-public ocaml-utop + (package + (name "ocaml-utop") + (version "2.8.0") + (home-page "https://github.com/ocaml-community/utop") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zf4hg33sblzh2f65vk0292jg4jlwa8702kfwpsg1kcg4w6nsfdp")))) + (build-system dune-build-system) + (arguments + '(#:test-target ".")) + (propagated-inputs + `(("ocaml-lambda-term" ,ocaml-lambda-term) + ("ocaml-lwt" ,ocaml-lwt) + ("ocaml-lwt-react" ,ocaml-lwt-react) + ("ocaml-camomile" ,ocaml-camomile) + ("ocaml-react" ,ocaml-react))) + (native-inputs + `(("ocaml-cppo" ,ocaml-cppo))) + (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 + (inherit ocaml-utop) (name "ocaml4.07-utop") (version "2.4.3") (source @@ -4162,13 +4194,7 @@ (define-public ocaml4.07-utop ("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") - (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))) + ("zed" ,ocaml4.07-zed))))) (define-public ocaml-integers (package