JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocamlPackages.mirage-flow: use Dune 3

Browse Source
This commit is contained in:
Vincent Laporte 2023-03-28 08:57:46 +02:00
parent 1bf4036f3c
commit 4f2c5e880d
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/ocaml-modules/mirage-flow/combinators.nix
View File

@ -1,11 +1,13 @@
{ buildDunePackage, mirage-flow, fmt, ocaml_lwt, logs, cstruct, mirage-clock }: { buildDunePackage, mirage-flow, fmt, lwt, logs, cstruct, mirage-clock }:
buildDunePackage { buildDunePackage {
pname = "mirage-flow-combinators"; pname = "mirage-flow-combinators";
inherit (mirage-flow) version useDune2 src; inherit (mirage-flow) version src;
propagatedBuildInputs = [ ocaml_lwt logs cstruct mirage-clock mirage-flow ]; duneVersion = "3";
propagatedBuildInputs = [ lwt logs cstruct mirage-clock mirage-flow ];
meta = mirage-flow.meta // { meta = mirage-flow.meta // {
description = "Flow implementations and combinators for MirageOS specialized to lwt"; description = "Flow implementations and combinators for MirageOS specialized to lwt";

10
pkgs/development/ocaml-modules/mirage-flow/default.nix
View File

@ -1,18 +1,18 @@
{ lib, buildDunePackage, fetchurl, cstruct, fmt, ocaml_lwt }: { lib, buildDunePackage, fetchurl, cstruct, fmt, lwt }:
buildDunePackage rec { buildDunePackage rec {
pname = "mirage-flow"; pname = "mirage-flow";
version = "3.0.0"; version = "3.0.0";
useDune2 = true; duneVersion = "3";
minimumOCamlVersion = "4.05"; minimalOCamlVersion = "4.05";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-v${version}.tbz"; url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-v${version}.tbz";
sha256 = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw="; hash = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw=";
}; };
propagatedBuildInputs = [ cstruct fmt ocaml_lwt ]; propagatedBuildInputs = [ cstruct fmt lwt ];
meta = { meta = {
description = "Flow implementations and combinators for MirageOS"; description = "Flow implementations and combinators for MirageOS";

4
pkgs/development/ocaml-modules/mirage-flow/unix.nix
View File

@ -5,7 +5,9 @@
buildDunePackage { buildDunePackage {
pname = "mirage-flow-unix"; pname = "mirage-flow-unix";
inherit (mirage-flow) version useDune2 src; inherit (mirage-flow) version src;
duneVersion = "3";
# Make tests compatible with alcotest 1.4.0 # Make tests compatible with alcotest 1.4.0
postPatch = '' postPatch = ''