about summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2020-12-29 23:15:56 -0500
committerGitHub <noreply@github.com>2020-12-29 23:15:56 -0500
commitad62a26d916ea438ab8756c8af28514fbd344ace (patch)
tree723fa2f8f6715643b9a1eb10e302f4acc6abf345 /pkgs/development/ocaml-modules
parent2518b486ef85001f961387a9a7be12a65cc68a12 (diff)
parenteac6fcc16c9a5b9e9a5591cc04f1989bbec9f6f4 (diff)
downloadnixlib-ad62a26d916ea438ab8756c8af28514fbd344ace.tar
nixlib-ad62a26d916ea438ab8756c8af28514fbd344ace.tar.gz
nixlib-ad62a26d916ea438ab8756c8af28514fbd344ace.tar.bz2
nixlib-ad62a26d916ea438ab8756c8af28514fbd344ace.tar.lz
nixlib-ad62a26d916ea438ab8756c8af28514fbd344ace.tar.xz
nixlib-ad62a26d916ea438ab8756c8af28514fbd344ace.tar.zst
nixlib-ad62a26d916ea438ab8756c8af28514fbd344ace.zip
Merge pull request #107928 from sternenseemann/ocaml-mirage-console-4.0.0
ocamlPackages.mirage-console: 3.0.2 -> 4.0.0 and add -unix package
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r--pkgs/development/ocaml-modules/mirage-console/default.nix6
-rw-r--r--pkgs/development/ocaml-modules/mirage-console/unix.nix17
2 files changed, 21 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/mirage-console/default.nix b/pkgs/development/ocaml-modules/mirage-console/default.nix
index ccde5c5f2ae2..986084c3f54c 100644
--- a/pkgs/development/ocaml-modules/mirage-console/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-console/default.nix
@@ -4,13 +4,15 @@
 
 buildDunePackage rec {
   pname = "mirage-console";
-  version = "3.0.2";
+  version = "4.0.0";
+
+  minimumOCamlVersion = "4.08";
 
   useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-console/releases/download/v${version}/mirage-console-v${version}.tbz";
-    sha256 = "1fygk7pvlmwx6vd0h4cv9935xxhi64k2dgym41wf6qfkxgpp31lm";
+    sha256 = "11nwfd4kmmdzkrkhbakdi3cxhk8vi98l17960rgcf85c602gw6vp";
   };
 
   propagatedBuildInputs = [ lwt mirage-device mirage-flow ];
diff --git a/pkgs/development/ocaml-modules/mirage-console/unix.nix b/pkgs/development/ocaml-modules/mirage-console/unix.nix
new file mode 100644
index 000000000000..dea613511a29
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mirage-console/unix.nix
@@ -0,0 +1,17 @@
+{ buildDunePackage, mirage-console, lwt, cstruct, cstruct-lwt }:
+
+buildDunePackage {
+  pname = "mirage-console-unix";
+
+  inherit (mirage-console) version src useDune2 minimumOCamlVersion;
+
+  propagatedBuildInputs = [
+    mirage-console
+    cstruct
+    cstruct-lwt
+  ];
+
+  meta = mirage-console.meta // {
+    description = "Implementation of Mirage consoles for Unix";
+  };
+}