diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-12-12 08:47:30 +0100 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2023-12-14 07:52:48 +0100 |
commit | eb4a64ebbd418b9e94b77e9c84b2302976cea758 (patch) | |
tree | 3ce7712389fad7a95ab7261228307b7eb08ec27b /pkgs/development/ocaml-modules | |
parent | 8302eefde0758c90cd035f56c99c806a49935c4e (diff) |
ocamlPackages.functoria: 4.3.6 → 4.4.1
Diffstat (limited to 'pkgs/development/ocaml-modules')
4 files changed, 21 insertions, 18 deletions
diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix index 1b4eb502b64ac..e126c707285ab 100644 --- a/pkgs/development/ocaml-modules/functoria/default.nix +++ b/pkgs/development/ocaml-modules/functoria/default.nix @@ -1,21 +1,19 @@ -{ lib, fetchurl, buildDunePackage, cmdliner +{ lib, buildDunePackage, cmdliner +, functoria-runtime , rresult, astring, fmt, logs, bos, fpath, emile, uri +, alcotest }: -buildDunePackage rec { +buildDunePackage { pname = "functoria"; - version = "4.3.6"; + inherit (functoria-runtime) version src; minimalOCamlVersion = "4.08"; - src = fetchurl { - url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz"; - hash = "sha256-i/5sZHfxECoKYMdGje+U21GWxJ6dDZreVcQGtbuo4SE="; - }; - propagatedBuildInputs = [ cmdliner rresult astring fmt logs bos fpath emile uri ]; - doCheck = false; + doCheck = true; + checkInputs = [ alcotest functoria-runtime ]; meta = with lib; { description = "A DSL to organize functor applications"; diff --git a/pkgs/development/ocaml-modules/functoria/runtime.nix b/pkgs/development/ocaml-modules/functoria/runtime.nix index 1eb2eec48e440..3ede6096e5080 100644 --- a/pkgs/development/ocaml-modules/functoria/runtime.nix +++ b/pkgs/development/ocaml-modules/functoria/runtime.nix @@ -1,14 +1,21 @@ -{ lib, buildDunePackage, functoria, cmdliner, fmt }: +{ lib, buildDunePackage, fetchurl, cmdliner }: -buildDunePackage { +buildDunePackage rec { pname = "functoria-runtime"; + version = "4.4.1"; - inherit (functoria) version src; + src = fetchurl { + url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz"; + hash = "sha256-FKCdzrRJVpUrCWqrTiE8l00ZKJOYsvI9mNzJ0ZxDBwg="; + }; + + minimalOCamlVersion = "4.08"; - propagatedBuildInputs = [ cmdliner fmt ]; + propagatedBuildInputs = [ cmdliner ]; meta = with lib; { - inherit (functoria.meta) homepage license; + homepage = "https://github.com/mirage/functoria"; + license = licenses.isc; description = "Runtime support library for functoria-generated code"; maintainers = [ maintainers.sternenseemann ]; }; diff --git a/pkgs/development/ocaml-modules/mirage/default.nix b/pkgs/development/ocaml-modules/mirage/default.nix index 98d96cf146f0b..410475b6b5c00 100644 --- a/pkgs/development/ocaml-modules/mirage/default.nix +++ b/pkgs/development/ocaml-modules/mirage/default.nix @@ -8,7 +8,6 @@ buildDunePackage rec { inherit (mirage-runtime) version src; minimalOCamlVersion = "4.08"; - duneVersion = "3"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix index 0b7d929f5a8eb..7e20e3363a473 100644 --- a/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchurl, ipaddr, functoria-runtime -, fmt, logs, lwt +, logs, lwt , alcotest }: @@ -8,9 +8,8 @@ buildDunePackage rec { inherit (functoria-runtime) src version; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs lwt ]; + propagatedBuildInputs = [ ipaddr functoria-runtime logs lwt ]; checkInputs = [ alcotest ]; doCheck = true; |