From 90325214d4163d1092a2038cd593b8b2c907c183 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:45:24 +0200 Subject: [PATCH 01/24] ocaml: update to 4.14.0. --- srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch | 16 ++++++++-------- srcpkgs/ocaml/template | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch index 333276741c7d..a26f6a639e18 100644 --- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch +++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch @@ -18,25 +18,25 @@ .globl caml_system__frametable .type caml_system__frametable, @object caml_system__frametable: ---- ocaml-4.11.0/configure.ac -+++ ocaml-4.11.0/configure.ac +--- ocaml-4.14.0/configure.ac ++++ ocaml-4.14.0/configure.ac @@ -1006,7 +1006,7 @@ AS_IF([test $arch != "none" && $arch64 ], # e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader. AS_CASE([$arch], -- [amd64|s390x|none], -+ [amd64|s390x|power|none], +- [amd64|arm64|s390x|none], ++ [amd64|arm64|s390x|power|none], # ocamlopt generates PIC code or doesn't generate code at all [], [AS_CASE([$host], ---- ocaml-4.11.0/configure -+++ ocaml-4.11.0/configure +--- ocaml-4.14.0/configure ++++ ocaml-4.14.0/configure @@ -13886,7 +13886,7 @@ # e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader. case $arch in #( -- amd64|s390x|none) : -+ amd64|s390x|power|none) : +- amd64|arm64|s390x|none) : ++ amd64|arm64|s390x|power|none) : # ocamlopt generates PIC code or doesn't generate code at all ;; #( *) : diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template index 629c13791dfe..7de25d70b827 100644 --- a/srcpkgs/ocaml/template +++ b/srcpkgs/ocaml/template @@ -1,7 +1,7 @@ # Template file for 'ocaml' pkgname=ocaml -version=4.13.1 -revision=2 +version=4.14.0 +revision=1 build_style="gnu-configure" configure_args="--with-pic --libdir=/usr/lib/ocaml" make_build_target="world.opt" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="QPL-1.0, LGPL-2.1-only" homepage="http://ocaml.org/" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" -checksum=194c7988cc1fd1c64f53f32f2f7551e5309e44d914d6efc7e2e4d002296aeac4 +checksum=39f44260382f28d1054c5f9d8bf4753cb7ad64027da792f7938344544da155e8 nocross=yes export ASPP="cc -c" From 43b3121f37adc5e54ba9c890178e11abf549635c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:47:06 +0200 Subject: [PATCH 02/24] ocaml-findlib: update to 1.9.3. --- srcpkgs/ocaml-findlib/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template index 73cca5a2cafa..04be12e64f51 100644 --- a/srcpkgs/ocaml-findlib/template +++ b/srcpkgs/ocaml-findlib/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-findlib' pkgname=ocaml-findlib -version=1.9.1 -revision=3 +version=1.9.3 +revision=1 wrksrc="findlib-${version}" build_style=configure configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man" @@ -12,7 +12,7 @@ maintainer="John Regan " license="MIT" homepage="http://projects.camlcity.org/projects/findlib.html" distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz" -checksum=2b42b8bd54488d64c4bf3cb7054b4b37bd30c1dc12bd431ea1e4d7ad8a980fe2 +checksum=c310fcb62838d9e50f0b6d6c5ceefcbe4fe056f72496950ae7d5c6cdaae2cc41 nocross=yes nopie=yes disable_parallel_build=yes From cc0ea284c40195dc094d28f398e70cbe9dc16da2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:48:00 +0200 Subject: [PATCH 03/24] ocaml-num: rebuild for ocaml-4.14.0_1. --- srcpkgs/ocaml-num/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template index bfce4e7baf91..739ffcf5d419 100644 --- a/srcpkgs/ocaml-num/template +++ b/srcpkgs/ocaml-num/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-num' pkgname=ocaml-num version=1.4 -revision=3 +revision=4 wrksrc="num-${version}" build_style=gnu-makefile make_install_target="findlib-install" From 37ec99fe481ccb49378f8cc5cca7cc15ba4cc536 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:49:19 +0200 Subject: [PATCH 04/24] ocaml-zarith: rebuild for ocaml-4.14.0_1. --- srcpkgs/ocaml-zarith/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template index d6c12772723d..936b5cd3f607 100644 --- a/srcpkgs/ocaml-zarith/template +++ b/srcpkgs/ocaml-zarith/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-zarith' pkgname=ocaml-zarith version=1.12 -revision=3 +revision=4 wrksrc="Zarith-release-${version}" build_style=configure make_check_target="tests" From 48d2add0ea5a16c72f12a221e377d61e022cd969 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:50:43 +0200 Subject: [PATCH 05/24] ocamlbuild: rebuild for ocaml-4.14.0_1. --- srcpkgs/ocamlbuild/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template index 077d5cc7f632..b1349909f784 100644 --- a/srcpkgs/ocamlbuild/template +++ b/srcpkgs/ocamlbuild/template @@ -1,7 +1,7 @@ # Template file for 'ocamlbuild' pkgname=ocamlbuild version=0.14.1 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="PREFIX=/usr" make_install_args="PREFIX=/usr" @@ -13,3 +13,5 @@ homepage="https://github.com/ocaml/ocamlbuild" distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz" checksum=4e1279ff0ef80c862eaa5207a77020d741e89ef94f0e4a92a37c4188dbf08256 nocross=yes + +export CHECK_IF_PREINSTALLED=false From a6f6ae892d5405d07486e4001ecc617d468cf9a3 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:51:59 +0200 Subject: [PATCH 06/24] ocaml-stdcompat: update to 18. --- srcpkgs/ocaml-stdcompat/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template index 2035a9a2c4fa..65a0d6fbc78f 100644 --- a/srcpkgs/ocaml-stdcompat/template +++ b/srcpkgs/ocaml-stdcompat/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-stdcompat' pkgname=ocaml-stdcompat -version=16 -revision=2 +version=18 +revision=1 wrksrc="stdcompat-${version}" build_style=gnu-configure configure_args="--libdir=/usr/lib/ocaml" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="BSD-2-Clause" homepage="https://github.com/thierry-martinez/stdcompat" distfiles="https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz" -checksum=100152e25f138351cb265146cd8717fa9dbfbff54b48ce771e30a4e05fc1ec09 +checksum=483a8d526eb19709a1a3092fb8978302e3a9d3bb783d807fb9ee53d96c3ec607 nocross=yes disable_parallel_build=yes From 85fe7c410b6cb6e6971938ec67449d597242983e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:53:13 +0200 Subject: [PATCH 07/24] hivex: rebuild for ocaml-4.14.0_1. --- srcpkgs/hivex/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template index 448c06ddc9fa..f6f12d1b70f3 100644 --- a/srcpkgs/hivex/template +++ b/srcpkgs/hivex/template @@ -1,7 +1,7 @@ # Template file for 'hivex' pkgname=hivex version=1.3.21 -revision=4 +revision=5 build_style=gnu-configure configure_args="--disable-ocaml" # currently ocaml is broken hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy" From 775e3b97c7dcb55fde79c8d21e8e26948db80dd5 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:53:32 +0200 Subject: [PATCH 08/24] opam: rebuild for ocaml-4.14.0_1. --- srcpkgs/opam/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template index 236a2f963b70..ca5c64092ac8 100644 --- a/srcpkgs/opam/template +++ b/srcpkgs/opam/template @@ -1,7 +1,7 @@ # Template file for 'opam' pkgname=opam version=2.1.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--docdir=/usr/share/doc/${pkgname}" make_build_args="lib-ext all" From a7bdd8fdb380614f9c3ec43930291f076775f504 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:53:52 +0200 Subject: [PATCH 09/24] ocaml-lablgtk2: rebuild for ocaml-4.14.0_1. --- srcpkgs/ocaml-lablgtk2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template index c835e6b19d5d..6ff864eb1720 100644 --- a/srcpkgs/ocaml-lablgtk2/template +++ b/srcpkgs/ocaml-lablgtk2/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-lablgtk2' pkgname=ocaml-lablgtk2 version=2.18.10 -revision=4 +revision=5 wrksrc="lablgtk-${version}" build_style=gnu-configure configure_args="--without-glade --without-gnomeui --without-gtksourceview" From 687cf9e8f61b7b67c34de88a6f05c8af4eefdb3a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:56:12 +0200 Subject: [PATCH 10/24] pdfsandwich: rebuild for ocaml-4.14.0_1. --- srcpkgs/pdfsandwich/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template index f3603e064c90..82f2f934fdc1 100644 --- a/srcpkgs/pdfsandwich/template +++ b/srcpkgs/pdfsandwich/template @@ -1,7 +1,7 @@ # Template file for 'pdfsandwich' pkgname=pdfsandwich version=0.1.7 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="ocaml perl" makedepends="ocaml" From 2063764e7c96711a3f04d6fb709b99e2241c8f62 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:56:17 +0200 Subject: [PATCH 11/24] supermin: rebuild for ocaml-4.14.0_1. --- srcpkgs/supermin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template index 357fc3f255f8..5f80c3515b3d 100644 --- a/srcpkgs/supermin/template +++ b/srcpkgs/supermin/template @@ -1,7 +1,7 @@ # Template file for 'supermin' pkgname=supermin version=5.2.2 -revision=1 +revision=2 _release_series=5.2-stable build_style=gnu-configure hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl" From df677c044512a557ddc7b022a813b80744fcdd22 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:56:24 +0200 Subject: [PATCH 12/24] z3: rebuild for ocaml-4.14.0_1. --- srcpkgs/z3/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template index 2d5bf7a80954..dea059c98d0c 100644 --- a/srcpkgs/z3/template +++ b/srcpkgs/z3/template @@ -1,7 +1,7 @@ # Template file for 'z3' pkgname=z3 version=4.8.15 -revision=1 +revision=2 wrksrc="${pkgname}-${pkgname}-${version}" build_style=configure configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)" From 35f4f526e75fdacbd72d86ba49b635109b3ab671 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:01:53 +0200 Subject: [PATCH 13/24] coccinelle: rebuild for ocaml-4.14.0_1. --- srcpkgs/coccinelle/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template index 211c9bdb4394..709b45fd2f69 100644 --- a/srcpkgs/coccinelle/template +++ b/srcpkgs/coccinelle/template @@ -1,7 +1,7 @@ # Template file for 'coccinelle' pkgname=coccinelle version=1.1.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--without-pdflatex --enable-release --enable-opt --with-python=/usr/bin/python3" From db420e3f299f006aaba8ef41801332cbcaae3ea8 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:03:56 +0200 Subject: [PATCH 14/24] libguestfs: rebuild for ocaml-4.14.0_1. --- srcpkgs/libguestfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template index 8d669017077e..c6c56f8142b7 100644 --- a/srcpkgs/libguestfs/template +++ b/srcpkgs/libguestfs/template @@ -1,7 +1,7 @@ # Template file for 'libguestfs' pkgname=libguestfs version=1.48.0 -revision=1 +revision=2 _version_short=${version%.*} build_style=gnu-configure make_install_args="INSTALLDIRS=vendor" From 820d274846ad7e49b7b7193172020235a3b76804 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:04:56 +0200 Subject: [PATCH 15/24] unison: rebuild for ocaml-4.14.0_1. --- srcpkgs/unison/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template index 783573c120ea..97eb209e2e8c 100644 --- a/srcpkgs/unison/template +++ b/srcpkgs/unison/template @@ -1,7 +1,7 @@ # Template file for 'unison' pkgname=unison version=2.52.0 -revision=1 +revision=2 hostmakedepends="ocaml" short_desc="File-synchronization tool" maintainer="allan " From 595ee6ed32033a9b3fc6e05d9109bc80ce45ef0c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:08:51 +0200 Subject: [PATCH 16/24] camlp5: rebuild for ocaml-4.14.0_1. --- srcpkgs/camlp5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template index 2d07ecc842b4..74e0809e16d1 100644 --- a/srcpkgs/camlp5/template +++ b/srcpkgs/camlp5/template @@ -1,7 +1,7 @@ # Template file for 'camlp5' pkgname=camlp5 version=8.00.03 -revision=1 +revision=2 wrksrc="camlp5-rel${version}" build_style=configure configure_args="-mandir /usr/share/man" From 7ca6ccf733031c1f687deec8a236a5b87b5d2ac0 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:12:31 +0200 Subject: [PATCH 17/24] dune: rebuild for ocaml-4.14.0_1. --- srcpkgs/dune/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template index 178746cfc292..30c34cb44c00 100644 --- a/srcpkgs/dune/template +++ b/srcpkgs/dune/template @@ -1,7 +1,7 @@ # Template file for 'dune' pkgname=dune version=3.0.3 -revision=1 +revision=2 makedepends="ocaml" depends="ocaml" short_desc="Composable build system for OCaml" From 51e91ed20ba13f05dcf9890dfc28729848f8525d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:18:07 +0200 Subject: [PATCH 18/24] New package: ocaml-camlp-streams-5.0 --- srcpkgs/ocaml-camlp-streams/template | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/ocaml-camlp-streams/template diff --git a/srcpkgs/ocaml-camlp-streams/template b/srcpkgs/ocaml-camlp-streams/template new file mode 100644 index 000000000000..ce728427d280 --- /dev/null +++ b/srcpkgs/ocaml-camlp-streams/template @@ -0,0 +1,22 @@ +# Template file for 'ocaml-camlp-streams' +pkgname=ocaml-camlp-streams +version=5.0 +revision=1 +wrksrc="camlp-streams-${version}" +makedepends="ocaml dune" +short_desc="Stream and Genlex libraries for use with Camlp4 and Camlp5" +maintainer="Leah Neukirchen " +license="LGPL-2.1-only,OCaml-LGPL-linking-exception" +homepage="https://github.com/ocaml/camlp-streams" +distfiles="https://github.com/ocaml/camlp-streams/archive/v${version}.tar.gz" +checksum=daa618bb57a876075a1801d9dcde7dee83635766185f565af913dff43ea4d226 +nocross=yes +disable_parallel_build=yes + +do_build() { + dune build --display=short +} +do_install() { + dune install --prefix=/usr --destdir="$DESTDIR" \ + --libdir=/usr/lib/ocaml --docdir=/usr/share/doc +} From 1f6d992782436948691a4d3f0431b948fe057322 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:23:36 +0200 Subject: [PATCH 19/24] camlp5: rebuild for ocaml-4.14.0_1. --- srcpkgs/camlp5/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template index 74e0809e16d1..1118f618ba1f 100644 --- a/srcpkgs/camlp5/template +++ b/srcpkgs/camlp5/template @@ -1,11 +1,12 @@ # Template file for 'camlp5' pkgname=camlp5 version=8.00.03 -revision=2 +revision=3 wrksrc="camlp5-rel${version}" build_style=configure configure_args="-mandir /usr/share/man" hostmakedepends="ocaml perl ocaml-findlib" +makedepends="ocaml-camlp-streams" short_desc="OCaml preprocessor and pretty-printer" maintainer="Leah Neukirchen " license="BSD-3-Clause" From 19934b77b3829525552a5117b6d919930219d9fb Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:23:46 +0200 Subject: [PATCH 20/24] coq: rebuild for ocaml-4.14.0_1. --- srcpkgs/coq/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template index fcfbc92cb2f6..5db6a99c5e5e 100644 --- a/srcpkgs/coq/template +++ b/srcpkgs/coq/template @@ -1,7 +1,7 @@ # Template file for 'coq' pkgname=coq version=8.15.1 -revision=1 +revision=2 hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith" short_desc="Proof assistant written in OCaml" maintainer="Leah Neukirchen " From 866017b4906a3ec56eaabc3c325c5593b0518590 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:30:50 +0200 Subject: [PATCH 21/24] mathcomp: rebuild for coq-8.15.1_2. --- srcpkgs/mathcomp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template index 5946de08e18b..9bdea51dcf48 100644 --- a/srcpkgs/mathcomp/template +++ b/srcpkgs/mathcomp/template @@ -1,7 +1,7 @@ # Template file for 'mathcomp' pkgname=mathcomp version=1.14.0 -revision=1 +revision=2 wrksrc="math-comp-mathcomp-${version}" build_wrksrc="mathcomp" build_style=gnu-makefile From bdbb0afc39ee35ed47f596296f412b121dbf43a0 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 21:48:14 +0200 Subject: [PATCH 22/24] xen: rebuild for ocaml-4.14.0_1. --- srcpkgs/xen/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template index deb572fe8b9c..cca4b6211bec 100644 --- a/srcpkgs/xen/template +++ b/srcpkgs/xen/template @@ -1,7 +1,7 @@ # Template file for 'xen' pkgname=xen version=4.14.1 -revision=5 +revision=6 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63 # TODO: arm / aarch64 @@ -10,8 +10,9 @@ build_style=gnu-configure configure_args="$(vopt_enable stubdom) --disable-systemd --with-system-seabios=/usr/share/seabios/bios.bin --with-sysconfig-leaf-dir=conf.d --with-rundir=/run" -hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git - ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget" +hostmakedepends="acpica-utils automake bin86 bison fig2dev flex gettext + ghostscript git ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar + texinfo wget" makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel From a3c9d2926d949f19255989b9cd6b4fb061f939ce Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 22:03:19 +0200 Subject: [PATCH 23/24] zeroinstall: rebuild for ocaml-4.14.0_1. --- srcpkgs/zeroinstall/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template index eb8e1ea24280..40d8740b1300 100644 --- a/srcpkgs/zeroinstall/template +++ b/srcpkgs/zeroinstall/template @@ -1,7 +1,7 @@ # Template file for 'zeroinstall' pkgname=zeroinstall version=2.17 -revision=5 +revision=6 wrksrc="0install-v${version}" build_style=gnu-makefile make_install_target="install_system" From 39ac2591b937e42584d396f24ea6da8913a21a18 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 14 Apr 2022 14:27:09 +0200 Subject: [PATCH 24/24] opam: disable tests in ci. --- srcpkgs/opam/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template index ca5c64092ac8..dd27afd02a0d 100644 --- a/srcpkgs/opam/template +++ b/srcpkgs/opam/template @@ -17,6 +17,7 @@ distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz" checksum=735e717532f135064940fe3fef573acce6b1bbdc5e146470c2ac20fc8510a470 nocross=yes disable_parallel_build=yes +make_check=ci-skip # uses bwrap post_install() { rm -rf ${DESTDIR}/usr/doc