From e69aee3280033dd7fbf90bfe479fc279e43a365e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 26 Jun 2022 18:44:15 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.io-page:=202.3.0=20=E2=86=92=202.?= =?UTF-8?q?4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.mirage-block: 2.0.1 → 3.0.0 ocamlPackages.mirage-block-ramdisk: disable tests ocamlPackages.mirage-block-unix: 2.12.1 → 2.14.1 ocamlPackages.mirage-unix: 4.0.0 → 4.0.1 ocamlPackages.vchan: 6.0.0 → 6.0.1 ocamlPackages.wodan-unix: mark as broken --- .../ocaml-modules/io-page/default.nix | 7 +++---- .../development/ocaml-modules/io-page/unix.nix | 17 ----------------- .../mirage-block-ramdisk/default.nix | 15 +++------------ .../mirage-block-unix/default.nix | 18 ++++++++---------- .../ocaml-modules/mirage-block/combinators.nix | 12 ++---------- .../ocaml-modules/mirage-block/default.nix | 10 ++++------ .../ocaml-modules/mirage-unix/default.nix | 10 ++++------ .../ocaml-modules/vchan/default.nix | 12 +++++------- pkgs/development/ocaml-modules/wodan/irmin.nix | 4 ++-- pkgs/development/ocaml-modules/wodan/unix.nix | 5 +++-- pkgs/top-level/ocaml-packages.nix | 2 -- 11 files changed, 34 insertions(+), 78 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/io-page/unix.nix diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index 9685e27d0b8a..97c941c89183 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -2,14 +2,13 @@ buildDunePackage rec { pname = "io-page"; - version = "2.3.0"; + version = "2.4.0"; - useDune2 = true; - minimumOCamlVersion = "4.02.3"; + minimalOCamlVersion = "4.02.3"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "1hx27pwf419hrhwaw9cphbnl8akz8yy73hqj49l15g2k7shah1cn"; + sha256 = "sha256-gMr0AfnDifHM912TstgkI+Q0FxB1rAyb0Abfospt9EI="; }; propagatedBuildInputs = [ cstruct bigarray-compat ]; diff --git a/pkgs/development/ocaml-modules/io-page/unix.nix b/pkgs/development/ocaml-modules/io-page/unix.nix deleted file mode 100644 index 843451b30866..000000000000 --- a/pkgs/development/ocaml-modules/io-page/unix.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, buildDunePackage, io-page, cstruct, ounit }: - -buildDunePackage { - pname = "io-page-unix"; - - inherit (io-page) version src useDune2 minimumOCamlVersion; - - propagatedBuildInputs = [ cstruct io-page ]; - checkInputs = [ ounit ]; - doCheck = true; - - meta = with lib; { - inherit (io-page.meta) homepage license; - description = "Support for efficient handling of I/O memory pages on Unix"; - maintainers = [ maintainers.sternenseemann ]; - }; -} diff --git a/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix b/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix index 7e8ebba73eb5..94e862a6bc9c 100644 --- a/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix +++ b/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix @@ -1,29 +1,20 @@ -{ lib, fetchurl, buildDunePackage, io-page, io-page-unix, mirage-block, alcotest -, mirage-block-combinators }: +{ lib, fetchurl, buildDunePackage, io-page, mirage-block }: buildDunePackage rec { pname = "mirage-block-ramdisk"; version = "0.5"; - useDune2 = true; - src = fetchurl { url = "https://github.com/mirage/mirage-block-ramdisk/releases/download/${version}/mirage-block-ramdisk-${version}.tbz"; sha256 = "cc0e814fd54efe7a5b7a8c5eb1c04e2dece751b7d8dee2d95908a0768896e8af"; }; - # Make tests compatible with alcotest 1.4.0 - postPatch = '' - substituteInPlace test/tests.ml --replace 'Fmt.kstrf Alcotest.fail' 'Fmt.kstrf (fun s -> Alcotest.fail s)' - ''; - - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.06"; propagatedBuildInputs = [ io-page mirage-block ]; - doCheck = true; - checkInputs = [ alcotest io-page-unix mirage-block-combinators ]; + doCheck = false; meta = with lib; { description = "In-memory BLOCK device for MirageOS"; diff --git a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix index a24c4c9e821f..34989fdf14db 100644 --- a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix +++ b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix @@ -1,24 +1,22 @@ -{ lib, fetchurl, buildDunePackage, cstruct-lwt, diet, io-page-unix, logs -, mirage-block, ounit, rresult, uri }: +{ lib, fetchurl, buildDunePackage, cstruct-lwt, diet, io-page, logs +, mirage-block, ounit2, rresult, uri }: buildDunePackage rec { pname = "mirage-block-unix"; - version = "2.12.1"; - - useDune2 = true; + version = "2.14.1"; src = fetchurl { url = - "https://github.com/mirage/mirage-block-unix/releases/download/v${version}/mirage-block-unix-v${version}.tbz"; - sha256 = "4fc0ccea3c06c654e149c0f0e1c2a6f19be4e3fe1afd293c6a0dba1b56b3b8c4"; + "https://github.com/mirage/mirage-block-unix/releases/download/v${version}/mirage-block-unix-${version}.tbz"; + sha256 = "sha256-FcUhbjHKT11ePDXaAVzUdV/WOHoxMoXyZKG5ikKpBNU="; }; - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.06"; - propagatedBuildInputs = [ cstruct-lwt logs mirage-block rresult uri ]; + propagatedBuildInputs = [ cstruct-lwt io-page logs mirage-block rresult uri ]; doCheck = true; - checkInputs = [ diet io-page-unix ounit ]; + checkInputs = [ diet ounit2 ]; meta = with lib; { description = "MirageOS disk block driver for Unix"; diff --git a/pkgs/development/ocaml-modules/mirage-block/combinators.nix b/pkgs/development/ocaml-modules/mirage-block/combinators.nix index 4787373c1e31..7dee169afd5b 100644 --- a/pkgs/development/ocaml-modules/mirage-block/combinators.nix +++ b/pkgs/development/ocaml-modules/mirage-block/combinators.nix @@ -1,16 +1,8 @@ -{ buildDunePackage, fetchpatch, mirage-block, io-page, logs }: +{ buildDunePackage, mirage-block, io-page, logs }: buildDunePackage rec { pname = "mirage-block-combinators"; - inherit (mirage-block) version src useDune2; - - patches = [ - (fetchpatch { - name = "cstruct-6.0.0-compat.patch"; - url = "https://github.com/mirage/mirage-block/pull/49/commits/ff54105b21fb32d0d6977b419db0776e6c2ea166.patch"; - sha256 = "0bwgypnsyn4d9b46q6r7kh5qfcy58db7krs6z5zw83hc7y20y2sd"; - }) - ]; + inherit (mirage-block) version src; propagatedBuildInputs = [ mirage-block io-page logs ]; diff --git a/pkgs/development/ocaml-modules/mirage-block/default.nix b/pkgs/development/ocaml-modules/mirage-block/default.nix index 28eb4d6b28ed..161fd4a66ead 100644 --- a/pkgs/development/ocaml-modules/mirage-block/default.nix +++ b/pkgs/development/ocaml-modules/mirage-block/default.nix @@ -1,19 +1,17 @@ { lib, fetchurl, buildDunePackage -, cstruct, lwt, mirage-device +, cstruct, lwt, fmt }: buildDunePackage rec { pname = "mirage-block"; - version = "2.0.1"; - - useDune2 = true; + version = "3.0.0"; src = fetchurl { url = "https://github.com/mirage/mirage-block/releases/download/v${version}/mirage-block-v${version}.tbz"; - sha256 = "1wp8wmixaz9i2sbvq6nkx903lbnpdgb2w404pz1wk8kcg9p3ilcc"; + sha256 = "sha256-NB5nJpppMtdi0HDjKcCAqRjO4vIbAMfnP934P+SnzmU="; }; - propagatedBuildInputs = [ cstruct lwt mirage-device ]; + propagatedBuildInputs = [ cstruct lwt fmt ]; meta = with lib; { description = "Block signatures and implementations for MirageOS"; diff --git a/pkgs/development/ocaml-modules/mirage-unix/default.nix b/pkgs/development/ocaml-modules/mirage-unix/default.nix index 1e6dc0ef144f..68ee12f12c9d 100644 --- a/pkgs/development/ocaml-modules/mirage-unix/default.nix +++ b/pkgs/development/ocaml-modules/mirage-unix/default.nix @@ -1,17 +1,15 @@ -{ lib, buildDunePackage, fetchurl, ocaml_lwt, duration, mirage-runtime, io-page-unix }: +{ lib, buildDunePackage, fetchurl, lwt, duration, mirage-runtime, io-page }: buildDunePackage rec { pname = "mirage-unix"; - version = "4.0.0"; - - useDune2 = true; + version = "4.0.1"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "0kyd83bkpjhn382b4mw3a4325xr8vms78znxqvifpcyfvfnlx7hj"; + sha256 = "sha256-9ymVBb3dkhb+MN97/sXe/oQ36CVx0kruj3sd19LiFZ4="; }; - propagatedBuildInputs = [ ocaml_lwt duration mirage-runtime io-page-unix ]; + propagatedBuildInputs = [ lwt duration mirage-runtime io-page ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/vchan/default.nix b/pkgs/development/ocaml-modules/vchan/default.nix index 54bf4e65004b..e88a86344285 100644 --- a/pkgs/development/ocaml-modules/vchan/default.nix +++ b/pkgs/development/ocaml-modules/vchan/default.nix @@ -1,19 +1,18 @@ { lib, buildDunePackage, fetchurl -, ppx_cstruct, ppx_sexp_conv, ounit, io-page-unix +, ppx_cstruct, ppx_sexp_conv, ounit , lwt, cstruct, io-page, mirage-flow, xenstore, xenstore_transport , sexplib, cmdliner }: buildDunePackage rec { pname = "vchan"; - version = "6.0.0"; + version = "6.0.1"; - useDune2 = true; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/ocaml-vchan/releases/download/v${version}/vchan-v${version}.tbz"; - sha256 = "7a6cc89ff8ba7144d6cef3f36722f40deedb3cefff0f7be1b2f3b7b2a2b41747"; + url = "https://github.com/mirage/ocaml-vchan/releases/download/v${version}/vchan-${version}.tbz"; + sha256 = "sha256-5E7dITMVirYoxUkp8ZamRAolyhA6avXGJNAioxeBuV0="; }; nativeBuildInputs = [ @@ -34,7 +33,6 @@ buildDunePackage rec { doCheck = true; checkInputs = [ cmdliner - io-page-unix ounit ]; diff --git a/pkgs/development/ocaml-modules/wodan/irmin.nix b/pkgs/development/ocaml-modules/wodan/irmin.nix index 86064d887dbb..4b158d5427ef 100644 --- a/pkgs/development/ocaml-modules/wodan/irmin.nix +++ b/pkgs/development/ocaml-modules/wodan/irmin.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, io-page-unix, irmin-chunk, irmin-git, irmin-unix +{ lib, buildDunePackage, irmin-chunk, irmin-git, irmin-unix , mirage-block-ramdisk, mirage-block-unix, wodan }: buildDunePackage rec { @@ -6,7 +6,7 @@ buildDunePackage rec { inherit (wodan) version src useDune2; propagatedBuildInputs = [ - io-page-unix + /* io-page-unix */ # No longer available in nixpkgs irmin-chunk irmin-git irmin-unix diff --git a/pkgs/development/ocaml-modules/wodan/unix.nix b/pkgs/development/ocaml-modules/wodan/unix.nix index 9b9cd841e0f1..bd694bce801b 100644 --- a/pkgs/development/ocaml-modules/wodan/unix.nix +++ b/pkgs/development/ocaml-modules/wodan/unix.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, base64, benchmark, csv, cmdliner, wodan, afl-persistent -, io-page-unix, mirage-block-ramdisk, mirage-block-unix }: +, mirage-block-ramdisk, mirage-block-unix }: buildDunePackage rec { outputs = [ "bin" "out" ]; @@ -12,7 +12,7 @@ buildDunePackage rec { benchmark cmdliner csv - io-page-unix + /* io-page-unix */ mirage-block-ramdisk mirage-block-unix wodan @@ -23,6 +23,7 @@ buildDunePackage rec { ''; meta = wodan.meta // { + broken = true; # io-page-unix is no longer available description = "Wodan clients with Unix integration"; mainProgram = "wodanc"; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d05abaddcfa8..10723fbc7a6d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -529,8 +529,6 @@ let io-page = callPackage ../development/ocaml-modules/io-page { }; - io-page-unix = callPackage ../development/ocaml-modules/io-page/unix.nix { }; - ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; ipaddr-cstruct = callPackage ../development/ocaml-modules/ipaddr/cstruct.nix { };