fix depexts

Author: zapashcanon

packages/conf-lld/conf-lld.1/opam

@@ -20,8 +20,9 @@ depexts: [
   ["lld"] { os-distribution = "centos" }
   ["lld"] { os-distribution = "fedora" }
   ["llvm"] { os-distribution = "homebrew" }
-  ["lld"] { os-distribution = "nixos" }
-  ["lld"] { os-distribution = "ol" }
+]
+x-ci-accept-failures: [
+  "ubuntu-20.04" # does not have wasm-ld
 ]
 available: os-distribution != "freebsd"
 synopsis: "Virtual package relying on lld installation"

packages/conf-rust-llvm/conf-rust-llvm.1/opam

@@ -9,21 +9,17 @@ build: [
 ]
 depends: [
   "conf-which" {build}
+  "conf-rust"
+  "conf-llvm"
+  "conf-lld"
 ]
 depexts: [
   ["rust-llvm"] { os-family = "alpine" }
   ["rust-llvm"] { os-family = "arch" }
   ["rust-llvm"] { os-family = "debian" }
-  ["lld"] { os-family = "open-suse" }
-  ["lld"] { os-family = "suse" }
   ["rust-llvm"] { os-family = "ubuntu" }
 
   ["rust-llvm"] { os-distribution = "centos" }
-  ["lld"] { os-distribution = "fedora" }
-  ["rustup" "llvm"] { distribution = "homebrew" }
-  ["rust-llvm"] { os-distribution = "nixos" }
-  ["rust-llvm"] { os-distribution = "ol" }
-
 ]
 available: os-distribution != "freebsd"
 synopsis: "Virtual package relying on an installation of the integration of Rust with LLVM tools"

packages/conf-rust-wasm/conf-rust-wasm.1/opam

@@ -18,8 +18,6 @@ depexts: [
 
   ["libstd-rust-dev-wasm32"] { os-distribution = "centos" }
   ["rust-std-static-wasm32-unknown-unknown"] { os-distribution = "fedora" }
-  ["libstd-rust-dev-wasm32"] { os-distribution = "nixos" }
-  ["libstd-rust-dev-wasm32"] { os-distribution = "ol" }
 ]
 available: os-distribution != "open-suse" & os-distribution != "suse" & os-distribution != "homebrew"
 synopsis: "Virtual package relying on an installation of standard Rust libraries including development files, needed to cross-compile Rust programs to the wasm32-unknown-unknown and wasm32-wasip1/wasm32-wasip2 targets"