Merge pull request ocaml#22505 from mefyl/master

kit-ty-kate · web-flow · commit 03cdcda5b3a7 · 2022-11-15T16:40:35.000Z
Fix conf-npm system dependency on OpenSUSE.
diff --git a/packages/conf-npm/conf-npm.1/opam b/packages/conf-npm/conf-npm.1/opam
@@ -20,7 +20,7 @@ depexts: [
   ["npm5"] {os-distribution = "macports" & os = "macos"}
   ["nodejs"] {os = "netbsd"}
   ["node"] {os = "openbsd"}
-  ["npm"] {os-family = "suse"}
+  ["npm-default"] {os-family = "suse"}
 ]
 x-ci-accept-failures: [
   "oraclelinux-7" # not available

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ depexts: [`
`20`	`20`	`["npm5"] {os-distribution = "macports" & os = "macos"}`
`21`	`21`	`["nodejs"] {os = "netbsd"}`
`22`	`22`	`["node"] {os = "openbsd"}`
`23`		`- ["npm"] {os-family = "suse"}`
	`23`	`+ ["npm-default"] {os-family = "suse"}`
`24`	`24`	`]`
`25`	`25`	`x-ci-accept-failures: [`
`26`	`26`	`"oraclelinux-7" # not available`