Merge pull request #6043 from dra27/fix-opam-file

Synchronise opam file changes in opam-core.opam
ocaml · Jul 1, 2024 · 76aab20 · 76aab20
2 parents b1c658a + 44fc175
commit 76aab20
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -72,6 +72,7 @@ users)
 ## VCS
 
 ## Build
+ * Synchronise opam-core.opam with opam-repository changes [#6043 @dra27]
 
 ## Infrastructure
 

diff --git a/opam-core.opam b/opam-core.opam
@@ -1,9 +1,8 @@
 opam-version: "2.0"
 version: "2.3.0~alpha~dev"
 synopsis: "Core library for opam 2.2"
-description: """
-Small standard library extensions, and generic system interaction modules used by opam.
-"""
+description:
+  "Small standard library extensions, and generic system interaction modules used by opam."
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "David Allsopp <david@tarides.com>"
@@ -19,16 +18,11 @@ authors: [
   "Ralf Treinen <ralf.treinen@pps.jussieu.fr>"
   "Frederic Tuong <tuong@users.gforge.inria.fr>"
 ]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://opam.ocaml.org"
 bug-reports: "https://github.com/ocaml/opam/issues"
-dev-repo: "git+https://github.com/ocaml/opam.git"
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
-build: [
-  ["./configure" "--disable-checks" "--prefix" prefix]
-  ["dune" "build" "-p" name "-j" jobs]
-]
 depends: [
-  "ocaml" {>= "4.08.0"}
+  "ocaml" {>= "4.08.0" & (os != "win32" | < "5.0")}
   "base-unix"
   "ocamlgraph"
   "re" {>= "1.9.0"}
@@ -37,5 +31,16 @@ depends: [
   "jsonm"
   "swhid_core"
   "uutf"
+  (("host-system-mingw" {os = "win32" & os-distribution != "cygwinports"} &
+    "conf-mingw-w64-gcc-i686" {os = "win32" & os-distribution != "cygwinports"} &
+    "conf-mingw-w64-gcc-x86_64" {os = "win32" & os-distribution != "cygwinports"}) |
+   ("host-system-msvc" {os = "win32" & os-distribution != "cygwinports"} &
+    "conf-msvc32" {os = "win32" & os-distribution != "cygwinports"} &
+    "conf-msvc64" {os = "win32" & os-distribution != "cygwinports"}))
+]
+conflicts: ["extlib-compat"]
+build: [
+  ["./configure" "--disable-checks" "--prefix" prefix]
+  ["dune" "build" "-p" name "-j" jobs]
 ]
-conflicts: "extlib-compat"
+dev-repo: "git+https://github.com/ocaml/opam.git"
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,6 +72,7 @@ users) @@
     ## VCS
     ## Build
+     * Synchronise opam-core.opam with opam-repository changes [#6043 @dra27]
     ## Infrastructure
@@ Expand Down @@