From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id +G20MI7Vm2Fm3AAAgWs5BA (envelope-from ) for ; Mon, 22 Nov 2021 18:38:22 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id +K5ZLI7Vm2GdMwAA1q6Kng (envelope-from ) for ; Mon, 22 Nov 2021 17:38:22 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7315B27DCC for ; Mon, 22 Nov 2021 18:38:22 +0100 (CET) Received: from localhost ([::1]:60488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpDGn-0005bE-5b for larch@yhetil.org; Mon, 22 Nov 2021 12:38:21 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637602702; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=bF5Cvym3PvCIHGtYYP/HGEbOV7JZygpkDuTax8MweDY=; b=Zhqf3A7ovtmgRZO2F9qER45qsuoy8hj0ghcVY8m74AxA8Sdl6BcutbT2MuJiWjBlPrlYYu uT/rbRyl/+rCshFO5ewNNQi/XArKQiwAZhIJPUlg3t6HYMY7fUzXEHfIOTpixnQLiKNO84 t2xhqbmFVNGel9J3Ns7ZFYA7hIy8tlj3VB1HB75v/Cq8MBOxwuy+nlD/ZZb0mbbwv6dFMh xLQzfUhcH7G0OMt4h2q5LSu+yBvWHUsx6Qa3t95aVNz1vrTEd3NKgisMPy4/3on1voS9Vq ON4jKJbFfdgKBm3At7Ch7VlRpCRmQ4BkiHMPLfQbQDTD2CEqQEZ30Oas5ZZaMg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637602702; a=rsa-sha256; cv=none; b=Lj6KjC/Eg15Ke/qWdCO3Xu8ele4gj6AhV7/o/S/z/lU0ZrS8mBIqmk+pEXBA38Vo01SN57 ZXpFriG2OpYMMhFb3UwTrjPbrKyrc55nZImPjmz3G1W0PcZDzKLwlzD8Grqr63wIkC8UZ4 Dh6USjViXfl16DiHBlAEHUou5EMc12iS18c2Pd2c5LkwsWORVGdl4cRJMHftDATSbILiFM 9Bfcv2bUFkUD8HcLdgEbIydWv8dH3Err1W3itqzYQGSdlRcdjOVrw+AShsVQTVElDohDoQ rKKwsxuBLwmAcuVWhmQE3NOWUo8SL8my+/1jsy6If41bQoD8kwemXOOW5GBVrg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=JiJNdEYv; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.28 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=JiJNdEYv; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 7315B27DCC X-Spam-Score: -1.28 X-Migadu-Scanner: scn0.migadu.com X-TUID: o0rvFSuWtCfb * 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") -- 2.32.0