Merge pull request #26261 from RyanGibb/nixos-depexts-automake-and-dpkg

mseri · web-flow · commit 5f02d4d75743 · 2024-07-19T10:21:29.000+02:00
conf-automake and conf-dpkg depexts on nixos
diff --git a/packages/conf-automake/conf-automake.1/opam b/packages/conf-automake/conf-automake.1/opam
@@ -28,6 +28,7 @@ depexts: [
   [ "automake" ] {os-family = "mageia"}
   [ "automake" ] {os-family = "suse" | os-family = "opensuse"}
   [ "devel/automake" ] {os-family = "bsd"}
+  [ "automake" ] {os-family = "nixos"}
 ]
 synopsis: "Virtual package relying on GNU automake"
 description: "This package can only install if GNU automake is installed on the system."
diff --git a/packages/conf-dpkg/conf-dpkg.1/opam b/packages/conf-dpkg/conf-dpkg.1/opam
@@ -19,6 +19,7 @@ depexts: [
   ["dpkg"] {os = "freebsd"}
   ["dpkg"] {os = "openbsd"}
   ["dpkg"] {os = "netbsd"}
+  ["dpkg"] {os-family = "nixos"}
 ]
 x-ci-accept-failures: [
   "oraclelinux-7" # Does not have the package by default

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ depexts: [`
`28`	`28`	`[ "automake" ] {os-family = "mageia"}`
`29`	`29`	`[ "automake" ] {os-family = "suse" \| os-family = "opensuse"}`
`30`	`30`	`[ "devel/automake" ] {os-family = "bsd"}`
	`31`	`+ [ "automake" ] {os-family = "nixos"}`
`31`	`32`	`]`
`32`	`33`	`synopsis: "Virtual package relying on GNU automake"`
`33`	`34`	`description: "This package can only install if GNU automake is installed on the system."`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ depexts: [`
`19`	`19`	`["dpkg"] {os = "freebsd"}`
`20`	`20`	`["dpkg"] {os = "openbsd"}`
`21`	`21`	`["dpkg"] {os = "netbsd"}`
	`22`	`+ ["dpkg"] {os-family = "nixos"}`
`22`	`23`	`]`
`23`	`24`	`x-ci-accept-failures: [`
`24`	`25`	`"oraclelinux-7" # Does not have the package by default`