reorg

Author: d-kalinichenko

packages/notty-community/notty-community.0.2.4+ox/files/lwt.patch

@@ -0,0 +1,29 @@
+--- a/src-lwt/notty_lwt.ml
++++ b/src-lwt/notty_lwt.ml
+@@ -43,7 +43,7 @@
+ 
+   let winches = lazy (
+     let c = Lwt_condition.create () in
+-    let `Revert _ = set_winch_handler (Lwt_condition.broadcast c) in
++    let `Revert _ = set_winch_handler (Base.Obj.magic_portable (Lwt_condition.broadcast c)) in
+     c
+   )
+ 
+--- a/src-lwt/notty_lwt.mli
++++ b/src-lwt/notty_lwt.mli
+@@ -44,7 +44,14 @@
+ 
+   val image   : t -> image -> unit Lwt.t
+   val refresh : t -> unit Lwt.t
+-  val cursor  : t -> (int * int) option -> unit Lwt.t
++  val cursor  : t -> (int * int *
++         [ `Bar
++         | `Bar_blinking
++         | `Block
++         | `Block_blinking
++         | `Default
++         | `Underline
++         | `Underline_blinking ] ) option -> unit Lwt.t
+ 
+   (** {1 Events} *)
+ 

packages/notty-community/notty-community.0.2.4+ox/opam

@@ -36,7 +36,6 @@ conflicts: [
 ]
 build: [
   ["dune" "subst"] {dev}
-  ["rm" "-rf" "src-lwt"]
   [
     "dune"
     "build"
@@ -73,6 +72,7 @@ patches: [
   "notty-add_href_support.patch"
   "notty-default_color.patch"
   "dune.patch"
+  "lwt.patch"
 ]
 extra-files: [
   [
@@ -131,4 +131,8 @@ extra-files: [
     "dune.patch"
     "sha256=0c8ff250019a910256f1f4993de5c52bbaa8c6a38723fa5462d1acd12d38ec8c"
   ]
+  [
+    "lwt.patch"
+    "sha256=bf322ab32307d3b8acfe289e3db6c353d2e7cd4781bf924d0d2fc864298a2565"
+  ]
 ]

packages/ppxlib/ppxlib.0.33.0+ox/files/dune.patch

@@ -43,31 +43,31 @@
 +++ b/shims/ast/dune
 @@ -0,0 +1,5 @@
 +(library
-+ (name ppxlib_ast)
++ (name ppxlib_ast_shim)
 + (wrapped false)
 + (public_name ppxlib.ast)
 + (libraries (re_export ppxlib_ast.ast)))
 --- /dev/null
 +++ b/shims/astlib/dune
 @@ -0,0 +1,5 @@
 +(library
-+ (name astlib)
++ (name astlib_shim)
 + (wrapped false)
 + (public_name ppxlib.astlib)
 + (libraries (re_export ppxlib_ast.astlib)))
 --- /dev/null
 +++ b/shims/stdppx/dune
 @@ -0,0 +1,5 @@
 +(library
-+ (name stdppx)
++ (name stdppx_shim)
 + (wrapped false)
 + (public_name ppxlib.stdppx)
 + (libraries (re_export ppxlib_ast.stdppx)))
 --- /dev/null
 +++ b/shims/traverse_builtins/dune
 @@ -0,0 +1,5 @@
 +(library
-+ (name ppxlib_traverse_builtins)
++ (name ppxlib_traverse_builtins_shim)
 + (wrapped false)
 + (public_name ppxlib.traverse_builtins)
 + (libraries (re_export ppxlib_ast.traverse_builtins)))
@@ -99,3 +99,98 @@
 +  (run ./gen/gen_ast_builder.exe %{lib:ppxlib_ast.ast:ast.ml})))
 
  (ocamllex skip_hash_bang)
+--- a/ast/dune
++++ b/ast/dune
+@@ -4,16 +4,16 @@
+
+ (library
+  (name ppxlib_ast)
+- (public_name ppxlib.ast)
+- (libraries astlib stdlib-shims)
++ (public_name ppxlib_ast.ast)
++ (libraries astlib compiler-libs.common ocaml-compiler-libs.common ocaml-compiler-libs.shadow stdlib-shims)
+  (flags
+-  (:standard -safe-string)
++  (:standard -safe-string -open Ocaml_shadow)
+   -w
+   -9-27-32)
+  (preprocess
+   (per_module
+    ((action
+-     (run %{exe:pp/pp.exe} %{ocaml_version} %{input-file}))
++     (run %{exe:pp/pp.exe} 9.99 %{input-file}))
+     versions)))
+  (lint
+   (pps ppxlib_traverse -deriving-keep-w32=impl)))
+--- a/astlib/dune
++++ b/astlib/dune
+@@ -1,6 +1,8 @@
+ (library
+  (name astlib)
+- (public_name ppxlib.astlib)
++ (public_name ppxlib_ast.astlib)
++ (modules ast_414 ast_500 ast_999 ast_metadata astlib config keyword location longident
++  migrate_414_500 migrate_500_414 migrate_500_999 migrate_999_500 parse pprintast stdlib0)
+  (libraries ocaml-compiler-libs.common compiler-libs.common)
+  (flags -w -9)
+  (preprocess
+@@ -10,7 +12,7 @@
+ (rule
+  (targets ast-version)
+  (action
+-  (run %{ocaml} %{dep:config/gen.ml} %{ocaml_version})))
++  (run %{ocaml} %{dep:config/gen.ml} 9.99)))
+
+ (cinaps
+  (files *.ml *.mli)
+--- a/stdppx/dune
++++ b/stdppx/dune
+@@ -1,6 +1,6 @@
+ (library
+  (name stdppx)
+- (public_name ppxlib.stdppx)
+- (libraries sexplib0 stdlib-shims)
++ (public_name ppxlib_ast.stdppx)
++ (libraries sexplib0 stdlib-shims sexp_type)
+  (flags
+   (:standard -safe-string)))
+--- a/traverse_builtins/dune
++++ b/traverse_builtins/dune
+@@ -1,5 +1,5 @@
+ (library
+  (name ppxlib_traverse_builtins)
+- (public_name ppxlib.traverse_builtins)
++ (public_name ppxlib_ast.traverse_builtins)
+  (flags
+   (:standard -safe-string)))
+--- a/dune-project
++++ b/dune-project
+@@ -13,6 +13,28 @@
+ (documentation "https://ocaml-ppx.github.io/ppxlib/")
+
+ (package
++ (name ppxlib_ast)
++ (depends
++  ocaml
++  (ocaml-compiler-libs (>= v0.11.0))
++  (ppx_derivers (>= 1.0))
++  (sexplib0 (>= v0.12))
++  stdlib-shims
++ (synopsis "Standard infrastructure for ppx rewriters")
++ (description "Ppxlib is the standard infrastructure for ppx rewriters
++and other programs that manipulate the in-memory representation of
++OCaml programs, a.k.a the \"Parsetree\".
++
++It also comes bundled with two ppx rewriters that are commonly used to
++write tools that manipulate and/or generate Parsetree values;
++`ppxlib.metaquot` which allows to construct Parsetree values using the
++OCaml syntax directly and `ppxlib.traverse` which provides various
++ways of automatically traversing values of a given type, in particular
++allowing to inject a complex structured value into generated code.
++")))
++
++
++(package
+  (name ppxlib)
+  (depends
+   ocaml