Merge pull request ocaml#26918 from RyanGibb/master

mseri · web-flow · commit 77ac16bb7019 · 2024-11-19T21:52:57.000+01:00
conf-capnproto on nixos
diff --git a/packages/conf-capnproto/conf-capnproto.2/opam b/packages/conf-capnproto/conf-capnproto.2/opam
@@ -24,6 +24,7 @@ depexts: [
   ["capnproto"] {os-distribution = "macports" & os = "macos"}
   ["capnproto" "libcapnp-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["capnproto"] {os = "freebsd"}
+  ["capnproto"] {os-distribution = "nixos"}
 ]
 x-ci-accept-failures: [
   "alpine-3.13"   # Does not have capnproto in the main repository

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ depexts: [`
`24`	`24`	`["capnproto"] {os-distribution = "macports" & os = "macos"}`
`25`	`25`	`["capnproto" "libcapnp-devel"] {os-family = "suse" \| os-family = "opensuse"}`
`26`	`26`	`["capnproto"] {os = "freebsd"}`
	`27`	`+ ["capnproto"] {os-distribution = "nixos"}`
`27`	`28`	`]`
`28`	`29`	`x-ci-accept-failures: [`
`29`	`30`	`"alpine-3.13" # Does not have capnproto in the main repository`