Merge pull request #28295 from kit-ty-kate/opam-2.4.1-no-avoid-version

mseri · web-flow · commit 3dab8c734b15 · 2025-08-04T16:25:19.000+02:00
opam-*.2.4.1: removing mistakenly added avoid-version flag
diff --git a/packages/opam-client/opam-client.2.4.1/opam b/packages/opam-client/opam-client.2.4.1/opam
@@ -34,8 +34,6 @@ conflicts: [
   "extlib" {< "1.7.8"}
   "extlib-compat"
 ]
-available: opam-version >= "2.1.0"
-flags: avoid-version
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
   ["dune" "build" "-p" name "-j" jobs]
diff --git a/packages/opam-core/opam-core.2.4.1/opam b/packages/opam-core/opam-core.2.4.1/opam
@@ -41,8 +41,6 @@ depends: [
     "conf-msvc64" {os = "win32" & os-distribution != "cygwinports"}))
 ]
 conflicts: ["extlib-compat"]
-available: opam-version >= "2.1.0"
-flags: avoid-version
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
   ["dune" "build" "-p" name "-j" jobs]
diff --git a/packages/opam-devel/opam-devel.2.4.1/opam b/packages/opam-devel/opam-devel.2.4.1/opam
@@ -28,8 +28,6 @@ depends: [
   "conf-openssl" {with-test}
   "conf-diffutils" {with-test}
 ]
-available: opam-version >= "2.1.0"
-flags: avoid-version
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
   [make "%{name}%.install"]
diff --git a/packages/opam-format/opam-format.2.4.1/opam b/packages/opam-format/opam-format.2.4.1/opam
@@ -26,8 +26,6 @@ depends: [
   "re" {>= "1.9.0"}
   "dune" {>= "2.8.0"}
 ]
-available: opam-version >= "2.1.0"
-flags: avoid-version
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
   ["dune" "build" "-p" name "-j" jobs]
diff --git a/packages/opam-installer/opam-installer.2.4.1/opam b/packages/opam-installer/opam-installer.2.4.1/opam
@@ -28,8 +28,6 @@ depends: [
   "cmdliner" {>= "0.9.8"}
   "dune" {>= "2.8.0"}
 ]
-available: opam-version >= "2.1.0"
-flags: avoid-version
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
   ["dune" "build" "-p" name "-j" jobs]
diff --git a/packages/opam-repository/opam-repository.2.4.1/opam b/packages/opam-repository/opam-repository.2.4.1/opam
@@ -26,8 +26,6 @@ depends: [
   "patch" {>= "3.0.0~alpha1"}
   "dune" {>= "2.8.0"}
 ]
-available: opam-version >= "2.1.0"
-flags: avoid-version
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
   ["dune" "build" "-p" name "-j" jobs]
diff --git a/packages/opam-solver/opam-solver.2.4.1/opam b/packages/opam-solver/opam-solver.2.4.1/opam
@@ -34,8 +34,6 @@ depopts: ["z3"]
 conflicts: [
   "z3" {< "4.8.4"}
 ]
-available: opam-version >= "2.1.0"
-flags: avoid-version
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
   ["dune" "build" "-p" name "-j" jobs]
diff --git a/packages/opam-state/opam-state.2.4.1/opam b/packages/opam-state/opam-state.2.4.1/opam
@@ -27,8 +27,6 @@ depends: [
   "spdx_licenses" {>= "1.0.0"}
   "dune" {>= "2.8.0"}
 ]
-available: opam-version >= "2.1.0"
-flags: avoid-version
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
   ["dune" "build" "-p" name "-j" jobs]

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ conflicts: [`
`34`	`34`	`"extlib" {< "1.7.8"}`
`35`	`35`	`"extlib-compat"`
`36`	`36`	`]`
`37`		`-available: opam-version >= "2.1.0"`
`38`		`-flags: avoid-version`
`39`	`37`	`build: [`
`40`	`38`	`["./configure" "--disable-checks" "--prefix" prefix]`
`41`	`39`	`["dune" "build" "-p" name "-j" jobs]`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,6 @@ depends: [`
`41`	`41`	`"conf-msvc64" {os = "win32" & os-distribution != "cygwinports"}))`
`42`	`42`	`]`
`43`	`43`	`conflicts: ["extlib-compat"]`
`44`		`-available: opam-version >= "2.1.0"`
`45`		`-flags: avoid-version`
`46`	`44`	`build: [`
`47`	`45`	`["./configure" "--disable-checks" "--prefix" prefix]`
`48`	`46`	`["dune" "build" "-p" name "-j" jobs]`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@ depends: [`
`28`	`28`	`"conf-openssl" {with-test}`
`29`	`29`	`"conf-diffutils" {with-test}`
`30`	`30`	`]`
`31`		`-available: opam-version >= "2.1.0"`
`32`		`-flags: avoid-version`
`33`	`31`	`build: [`
`34`	`32`	`["./configure" "--disable-checks" "--prefix" prefix]`
`35`	`33`	`[make "%{name}%.install"]`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@ depends: [`
`26`	`26`	`"re" {>= "1.9.0"}`
`27`	`27`	`"dune" {>= "2.8.0"}`
`28`	`28`	`]`
`29`		`-available: opam-version >= "2.1.0"`
`30`		`-flags: avoid-version`
`31`	`29`	`build: [`
`32`	`30`	`["./configure" "--disable-checks" "--prefix" prefix]`
`33`	`31`	`["dune" "build" "-p" name "-j" jobs]`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ depopts: ["z3"]`
`34`	`34`	`conflicts: [`
`35`	`35`	`"z3" {< "4.8.4"}`
`36`	`36`	`]`
`37`		`-available: opam-version >= "2.1.0"`
`38`		`-flags: avoid-version`
`39`	`37`	`build: [`
`40`	`38`	`["./configure" "--disable-checks" "--prefix" prefix]`
`41`	`39`	`["dune" "build" "-p" name "-j" jobs]`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@ depends: [`
`27`	`27`	`"spdx_licenses" {>= "1.0.0"}`
`28`	`28`	`"dune" {>= "2.8.0"}`
`29`	`29`	`]`
`30`		`-available: opam-version >= "2.1.0"`
`31`		`-flags: avoid-version`
`32`	`30`	`build: [`
`33`	`31`	`["./configure" "--disable-checks" "--prefix" prefix]`
`34`	`32`	`["dune" "build" "-p" name "-j" jobs]`