From bca81534f0543e3ca7902234ad2b6c7c57a53136 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 29 Dec 2020 22:45:42 +0100 Subject: [PATCH] ocamlPackages.mirage: fix build by adding missing deps Previously the mirage library/package wouldn't be built/installed correctly due to missing deps which I now added as specified in the opam file. While I was at it, I also enabled tests. --- .../ocaml-modules/mirage/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage/default.nix b/pkgs/development/ocaml-modules/mirage/default.nix index 9a4d3f21cb8..5160734e4f8 100644 --- a/pkgs/development/ocaml-modules/mirage/default.nix +++ b/pkgs/development/ocaml-modules/mirage/default.nix @@ -1,25 +1,34 @@ -{ lib, buildDunePackage, ocaml -, functoria, mirage-runtime +{ lib, buildDunePackage, alcotest +, functoria, mirage-runtime, bos +, ipaddr, astring, logs, stdlib-shims }: buildDunePackage rec { pname = "mirage"; inherit (mirage-runtime) version src; + minimumOCamlVersion = "4.08"; + useDune2 = true; outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ functoria mirage-runtime ]; + propagatedBuildInputs = [ + ipaddr + functoria + mirage-runtime + bos + astring + logs + stdlib-shims + ]; - installPhase = '' - runHook preInstall - dune install --prefix=$out --libdir=$dev/lib/ocaml/${ocaml.version}/site-lib/ ${pname} - runHook postInstall - ''; + doCheck = true; + checkInputs = [ + alcotest + ]; meta = mirage-runtime.meta // { description = "The MirageOS library operating system"; }; - }