ocamlPackages.lambda-term: 3.1.0 → 3.2.0

And fix the attribute name that used to be “lambdaTerm”
This commit is contained in:
Vincent Laporte 2022-02-23 21:16:30 +01:00 committed by Vincent Laporte
parent 971e1bab6f
commit 70e51d715e
4 changed files with 18 additions and 8 deletions

View file

@ -1,8 +1,18 @@
{ lib, fetchFromGitHub, buildDunePackage, zed, lwt_log, lwt_react, mew_vi }: { lib, fetchFromGitHub, buildDunePackage, ocaml, zed, lwt_log, lwt_react, mew_vi }:
let params =
if lib.versionAtLeast ocaml.version "4.08" then {
version = "3.2.0";
sha256 = "sha256:048k26644wq5wlwk0j179dxrxyz9nxqqq4vvhyh6pqpgxdajd44i";
} else {
version = "3.1.0";
sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg";
}
; in
buildDunePackage rec { buildDunePackage rec {
pname = "lambda-term"; pname = "lambda-term";
version = "3.1.0"; inherit (params) version;
useDune2 = true; useDune2 = true;
@ -10,7 +20,7 @@ buildDunePackage rec {
owner = "ocaml-community"; owner = "ocaml-community";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; inherit (params) sha256;
}; };
propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ]; propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ];

View file

@ -7,7 +7,7 @@
, cohttp , cohttp
, ocaml_lwt , ocaml_lwt
, cohttp-lwt-unix , cohttp-lwt-unix
, lambdaTerm , lambda-term
, stdlib-shims , stdlib-shims
}: }:
@ -30,7 +30,7 @@ buildDunePackage rec {
cohttp cohttp
ocaml_lwt ocaml_lwt
cohttp-lwt-unix cohttp-lwt-unix
lambdaTerm lambda-term
stdlib-shims stdlib-shims
]; ];

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, ocaml, findlib { lib, stdenv, fetchurl, ocaml, findlib
, lambdaTerm, cppo, makeWrapper, buildDunePackage , lambda-term, cppo, makeWrapper, buildDunePackage
}: }:
if !lib.versionAtLeast ocaml.version "4.03" if !lib.versionAtLeast ocaml.version "4.03"
@ -19,7 +19,7 @@ buildDunePackage rec {
nativeBuildInputs = [ makeWrapper cppo ]; nativeBuildInputs = [ makeWrapper cppo ];
propagatedBuildInputs = [ lambdaTerm ]; propagatedBuildInputs = [ lambda-term ];
postFixup = postFixup =
let let

View file

@ -620,7 +620,7 @@ let
lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { }; lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { };
lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { }; lambda-term = callPackage ../development/ocaml-modules/lambda-term { };
lens = callPackage ../development/ocaml-modules/lens { }; lens = callPackage ../development/ocaml-modules/lens { };