diff options
| author | Daniel Peukert | 2020-08-21 17:25:24 +0200 |
|---|---|---|
| committer | Daniel Peukert | 2020-08-21 17:25:24 +0200 |
| commit | 188bdfc2091db333cac75621d0eefab536130e84 (patch) | |
| tree | a89284e6b456d844f563038fff955dc28d80fcad | |
| parent | 8caca2b3436b12081141079d3a8c641c154c9f63 (diff) | |
| download | aur-188bdfc2091db333cac75621d0eefab536130e84.tar.gz | |
Added patch to ocaml-ppx_sexp_conv to work with current ocaml-ppxlib
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | ppxlib_longident.diff | 16 |
3 files changed, 31 insertions, 4 deletions
@@ -14,10 +14,12 @@ pkgbase = ocaml-ppx_sexp_conv makedepends = dune>=2.0.0 depends = ocaml>=4.04.2 depends = ocaml-base>=0.14.0 - depends = ocaml-ppxlib>=0.11.0 + depends = ocaml-ppxlib>=0.15.0 depends = ocaml-sexplib0>=0.14.0 options = !strip source = ocaml-ppx_sexp_conv-1:0.14.0-1.tar.gz::https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.0.tar.gz + source = ppxlib_longident.diff sha256sums = 4ec3e7999affd70689cdb6681e600cefa78032af2235733e6c012ac0b93e1dd6 + sha256sums = 57022c76bf54fe3ded5d2a5318b293a4f18d02923644b64158b2f2b5cea55ff6 pkgname = ocaml-ppx_sexp_conv @@ -9,14 +9,23 @@ pkgdesc='Generation of S-expression conversion functions from type definitions' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://github.com/janestreet/$_projectname" license=('MIT') -depends=('ocaml>=4.04.2' 'ocaml-base>=0.14.0' 'ocaml-ppxlib>=0.11.0' 'ocaml-sexplib0>=0.14.0') +depends=('ocaml>=4.04.2' 'ocaml-base>=0.14.0' 'ocaml-ppxlib>=0.15.0' 'ocaml-sexplib0>=0.14.0') makedepends=('dune>=2.0.0') options=('!strip') -source=("$pkgname-$epoch:$pkgver-$pkgrel.tar.gz::$url/archive/v$pkgver.tar.gz") -sha256sums=('4ec3e7999affd70689cdb6681e600cefa78032af2235733e6c012ac0b93e1dd6') +source=( + "$pkgname-$epoch:$pkgver-$pkgrel.tar.gz::$url/archive/v$pkgver.tar.gz" + 'ppxlib_longident.diff' +) +sha256sums=('4ec3e7999affd70689cdb6681e600cefa78032af2235733e6c012ac0b93e1dd6' + '57022c76bf54fe3ded5d2a5318b293a4f18d02923644b64158b2f2b5cea55ff6') _sourcedirectory="$_projectname-$pkgver" +prepare() { + cd "$srcdir/$_sourcedirectory/" + patch --forward -p1 < '../ppxlib_longident.diff' +} + build() { cd "$srcdir/$_sourcedirectory/" dune build --release --verbose diff --git a/ppxlib_longident.diff b/ppxlib_longident.diff new file mode 100644 index 000000000000..e8c621e138c9 --- /dev/null +++ b/ppxlib_longident.diff @@ -0,0 +1,16 @@ +diff --git a/expander/str_generate_sexp_grammar.ml b/expander/str_generate_sexp_grammar.ml +index 90e8690..38ca565 100644 +--- a/expander/str_generate_sexp_grammar.ml ++++ b/expander/str_generate_sexp_grammar.ml +@@ -5,6 +5,11 @@ open! Sexp.Private.Raw_grammar + module Var_name = String + module Type_name = String + ++module Longident = struct ++ include Longident ++ include (val Comparator.make ~compare ~sexp_of_t) ++end ++ + let debug_s message values = + Caml.prerr_endline (Sexp.to_string_hum (Sexp.message message values)) + ;; |