From d972bd23e003f82151e0f744b9e54bedc992e5ed Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 24 Nov 2020 08:20:38 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.functoria:=203.1.0=20=E2=86=92=20?= =?UTF-8?q?3.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/functoria/default.nix | 10 ++++++---- pkgs/development/ocaml-modules/functoria/runtime.nix | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix index 330ab26e8e6..4f108320399 100644 --- a/pkgs/development/ocaml-modules/functoria/default.nix +++ b/pkgs/development/ocaml-modules/functoria/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, buildDunePackage, alcotest, cmdliner +{ lib, fetchurl, buildDunePackage, alcotest, cmdliner , rresult, astring, fmt, ocamlgraph, logs, bos, fpath, ptime }: buildDunePackage rec { pname = "functoria"; - version = "3.1.0"; + version = "3.1.1"; + + useDune2 = true; minimumOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "15jdqdj1vfi0x9gjydrrnbwzwbzw34w1iir032jrji820xlblky2"; + sha256 = "0bihxbq16zwsi7frk4b8wz8993mvy2ym3n6288jhv0n0gb7c2f7m"; }; propagatedBuildInputs = [ cmdliner rresult astring fmt ocamlgraph logs bos fpath ptime ]; @@ -18,7 +20,7 @@ buildDunePackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A DSL to organize functor applications"; homepage = "https://github.com/mirage/functoria"; license = licenses.isc; diff --git a/pkgs/development/ocaml-modules/functoria/runtime.nix b/pkgs/development/ocaml-modules/functoria/runtime.nix index 806ae82b6ef..2ba13ce8738 100644 --- a/pkgs/development/ocaml-modules/functoria/runtime.nix +++ b/pkgs/development/ocaml-modules/functoria/runtime.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "functoria-runtime"; - inherit (functoria) version src; + inherit (functoria) version useDune2 src; propagatedBuildInputs = [ cmdliner fmt ]; checkInputs = [ alcotest functoria];