From 6b0396351eff4b51685d179560884e2a19051bb8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 Dec 2020 16:13:17 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.lambdaTerm:=202.0.3=20=E2=86=92?= =?UTF-8?q?=203.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.utop: 2.4.3 → 2.6.0 --- .../ocaml-modules/lambda-term/default.nix | 23 +++++++++++-------- pkgs/development/tools/ocaml/utop/default.nix | 8 ++++--- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index f02ff4d2996..0d5babad042 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, libev, buildDunePackage, zed, lwt_log, lwt_react }: +{ lib, fetchFromGitHub, buildDunePackage, zed, lwt_log, lwt_react, mew_vi }: buildDunePackage rec { pname = "lambda-term"; - version = "2.0.3"; + version = "3.1.0"; - src = fetchurl { - url = "https://github.com/ocaml-community/lambda-term/releases/download/${version}/lambda-term-${version}.tbz"; - sha256 = "1n1b3ffj41a1lm2315hh870yj9h8gg8g9jcxha6dr3xx8r84np3v"; + useDune2 = true; + + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = pname; + rev = version; + sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; }; - buildInputs = [ libev ]; - propagatedBuildInputs = [ zed lwt_log lwt_react ]; + propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ]; meta = { description = "Terminal manipulation library for OCaml"; longDescription = '' @@ -28,10 +31,10 @@ buildDunePackage rec { console applications. ''; - homepage = "https://github.com/diml/lambda-term"; - license = stdenv.lib.licenses.bsd3; + inherit (src.meta) homepage; + license = lib.licenses.bsd3; maintainers = [ - stdenv.lib.maintainers.gal_bolle + lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index ac7cd4f4dbb..2c4c330b286 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, dune +{ stdenv, fetchurl, ocaml, findlib , lambdaTerm, cppo, makeWrapper, buildDunePackage }: @@ -8,11 +8,13 @@ else buildDunePackage rec { pname = "utop"; - version = "2.4.3"; + version = "2.6.0"; + + useDune2 = true; src = fetchurl { url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; - sha256 = "107al0l3x4a5kkjka7glmhsqlm7pwzzc6shspiv5gsjb49pblc2f"; + sha256 = "17n9igl74xcvj0mzdh2ybda29f2m48a5lj4yf8lrdqr7vg0982jd"; }; nativeBuildInputs = [ makeWrapper ];