diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | remove-stdlib-shims-dep.diff | 93 |
3 files changed, 113 insertions, 8 deletions
@@ -1,22 +1,23 @@ pkgbase = ocaml-ppxlib pkgdesc = Utilities for working with Jane Street AST constructs pkgver = 0.32.1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/ocaml-ppx/ppxlib arch = x86_64 arch = aarch64 license = MIT makedepends = dune>=2.7.0 - depends = ocaml>=4.04.1 + depends = ocaml>=4.08.0 depends = ocaml-base>=0.15.0 depends = ocaml-compiler-libs-repackaged>=0.11.0 depends = ocaml-ppx_derivers>=1.0.0 depends = ocaml-sexplib0>=0.15.0 - depends = ocaml-stdlib-shims depends = ocaml-yojson depends = zstd options = !strip source = ocaml-ppxlib-0.32.1.tar.gz::https://github.com/ocaml-ppx/ppxlib/archive/0.32.1.tar.gz - sha512sums = 542b49667b3536ac20ddefe0673b833ec728cf0b02ef79da2c98a750bf5ea1293f688134b227638acbbcffd0e5f344ab4ed5b8db6291f1aef096d106fffd0ce9 + source = remove-stdlib-shims-dep.diff + b2sums = 307b8591eb3d0c5fe44cb4b8361c1196eb84d65fd1613e7e1fc0e6ae51a7572003acb6fb76f273a484d36cd53b5a26d7daaeb8074253fba64024dbf56031a5a4 + b2sums = ea788f8be0c78694deda9bbce59c0c98f1932776b10beeadc3b48b2685afa5c75da6943df80bc51ea68dde04463908b350d3cce366850a1d283a935c121cdf77 pkgname = ocaml-ppxlib @@ -3,19 +3,30 @@ _projectname='ppxlib' pkgname="ocaml-$_projectname" pkgver='0.32.1' -pkgrel='1' +pkgrel='2' pkgdesc='Utilities for working with Jane Street AST constructs' arch=('x86_64' 'aarch64') url="https://github.com/ocaml-ppx/$_projectname" license=('MIT') -depends=('ocaml>=4.04.1' 'ocaml-base>=0.15.0' 'ocaml-compiler-libs-repackaged>=0.11.0' 'ocaml-ppx_derivers>=1.0.0' 'ocaml-sexplib0>=0.15.0' 'ocaml-stdlib-shims' 'ocaml-yojson' 'zstd') +depends=('ocaml>=4.08.0' 'ocaml-base>=0.15.0' 'ocaml-compiler-libs-repackaged>=0.11.0' 'ocaml-ppx_derivers>=1.0.0' 'ocaml-sexplib0>=0.15.0' 'ocaml-yojson' 'zstd') makedepends=('dune>=2.7.0') options=('!strip') -source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") -sha512sums=('542b49667b3536ac20ddefe0673b833ec728cf0b02ef79da2c98a750bf5ea1293f688134b227638acbbcffd0e5f344ab4ed5b8db6291f1aef096d106fffd0ce9') +source=( + "$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz" + 'remove-stdlib-shims-dep.diff' +) +b2sums=('307b8591eb3d0c5fe44cb4b8361c1196eb84d65fd1613e7e1fc0e6ae51a7572003acb6fb76f273a484d36cd53b5a26d7daaeb8074253fba64024dbf56031a5a4' + 'ea788f8be0c78694deda9bbce59c0c98f1932776b10beeadc3b48b2685afa5c75da6943df80bc51ea68dde04463908b350d3cce366850a1d283a935c121cdf77') _sourcedirectory="$_projectname-$pkgver" +prepare() { + cd "$srcdir/$_sourcedirectory/" + + # Remove stdlib-shims dependency, as we're always running on OCaml >= 4.08.0 + patch --forward -p1 < '../remove-stdlib-shims-dep.diff' +} + build() { cd "$srcdir/$_sourcedirectory/" dune build --release --verbose diff --git a/remove-stdlib-shims-dep.diff b/remove-stdlib-shims-dep.diff new file mode 100644 index 000000000000..f485d969cdf8 --- /dev/null +++ b/remove-stdlib-shims-dep.diff @@ -0,0 +1,93 @@ +diff --git a/ast/dune b/ast/dune +index 03b233fb..01f2dd15 100644 +--- a/ast/dune ++++ b/ast/dune +@@ -5,7 +5,7 @@ + (library + (name ppxlib_ast) + (public_name ppxlib.ast) +- (libraries astlib stdlib-shims) ++ (libraries astlib) + (flags + (:standard -safe-string) + -w +diff --git a/dune-project b/dune-project +index 2d8104bb..afeea554 100644 +--- a/dune-project ++++ b/dune-project +@@ -20,7 +20,6 @@ + (ppx_derivers (>= 1.0)) + (sexplib0 (>= v0.12)) + (sexplib0 (and :with-test (>= "v0.15"))) ; Printexc.register_printer in sexplib0 changed +- stdlib-shims + (ocamlfind :with-test) + (re (and :with-test (>= 1.9.0))) + (cinaps (and :with-test (>= v0.12.1)))) +diff --git a/metaquot_lifters/dune b/metaquot_lifters/dune +index 17563c2e..0cd15393 100644 +--- a/metaquot_lifters/dune ++++ b/metaquot_lifters/dune +@@ -3,4 +3,4 @@ + (public_name ppxlib.metaquot_lifters) + (flags + (:standard -safe-string)) +- (libraries ppxlib ppxlib_traverse_builtins stdppx stdlib-shims)) ++ (libraries ppxlib ppxlib_traverse_builtins stdppx)) +diff --git a/ppxlib.opam b/ppxlib.opam +index 8ab343ee..290d57c2 100644 +--- a/ppxlib.opam ++++ b/ppxlib.opam +@@ -26,7 +26,6 @@ depends: [ + "ppx_derivers" {>= "1.0"} + "sexplib0" {>= "v0.12"} + "sexplib0" {with-test & >= "v0.15"} +- "stdlib-shims" + "ocamlfind" {with-test} + "re" {with-test & >= "1.9.0"} + "cinaps" {with-test & >= "v0.12.1"} +diff --git a/src/dune b/src/dune +index a9152b2a..79801299 100644 +--- a/src/dune ++++ b/src/dune +@@ -9,7 +9,6 @@ + ppx_derivers + ppxlib_traverse_builtins + stdppx +- stdlib-shims + sexplib0) + (flags + (:standard -safe-string)) +diff --git a/src/gen/dune b/src/gen/dune +index 0467c8ef..4426bf68 100644 +--- a/src/gen/dune ++++ b/src/gen/dune +@@ -2,4 +2,4 @@ + (names gen_ast_pattern gen_ast_builder) + (flags + (:standard -safe-string)) +- (libraries ppxlib_ast astlib ppxlib_traverse_builtins stdppx stdlib-shims)) ++ (libraries ppxlib_ast astlib ppxlib_traverse_builtins stdppx)) +diff --git a/stdppx/dune b/stdppx/dune +index 7f9ee528..17a82b30 100644 +--- a/stdppx/dune ++++ b/stdppx/dune +@@ -1,6 +1,6 @@ + (library + (name stdppx) + (public_name ppxlib.stdppx) +- (libraries sexplib0 stdlib-shims) ++ (libraries sexplib0) + (flags + (:standard -safe-string))) +diff --git a/traverse/dune b/traverse/dune +index 323501ae..9236e3cf 100644 +--- a/traverse/dune ++++ b/traverse/dune +@@ -4,6 +4,6 @@ + (kind ppx_deriver) + (flags + (:standard -safe-string)) +- (libraries ppxlib ppxlib_ast ppxlib_traverse_builtins stdppx stdlib-shims) ++ (libraries ppxlib ppxlib_ast ppxlib_traverse_builtins stdppx) + (preprocess + (pps ppxlib_metaquot))) |