Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/host-arch-arm32/host-arch-arm32.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ license: "CC0-1.0+"
homepage: "https://opam.ocaml.org"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
conflict-class: "ocaml-host-arch"
# Temporary, while these packages are not being installed by the compilers on
# non-Windows builds.
available: os = "win32" | arch = "arm32"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
available: os = "win32" | arch = "arm32"
available: os = "win32" & arch = "arm32"

???

Isn't it the prupose of this change that the package only appears on windows setups?

Or do we still want the packages available if they are requested specifically?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently in opam-repository, when you create a 4.13+ switch, you get the appropriate host-arch- package - which is either a specially-determined one for Windows (which does not depend on the arch variable) or, for Unix, you get the package corresponding to the arch global variable. The available constraint here is designed to leave the selection of the host-arch- package to the compiler package when os = "win32" (which is important - for x86_32 and x86_64 that doesn't necessarily correspond with the arch variable) while stopping a user from managing to manually install, say, host-arch-s390x.1 on macOS, just because that's confusing!

In particular, it means that depending on, say, host-arch-arm64 can still be used to indicate that a package requires arm64 support on Unix. What you can't do with this PR anymore is conflict host-arch-arm64 on Unix.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh ok, that makes more sense. Thanks.

3 changes: 3 additions & 0 deletions packages/host-arch-arm64/host-arch-arm64.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ license: "CC0-1.0+"
homepage: "https://opam.ocaml.org"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
conflict-class: "ocaml-host-arch"
# Temporary, while these packages are not being installed by the compilers on
# non-Windows builds.
available: os = "win32" | arch = "arm64"
3 changes: 3 additions & 0 deletions packages/host-arch-ppc64/host-arch-ppc64.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ license: "CC0-1.0+"
homepage: "https://opam.ocaml.org"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
conflict-class: "ocaml-host-arch"
# Temporary, while these packages are not being installed by the compilers on
# non-Windows builds.
available: os = "win32" | arch = "ppc64"
3 changes: 3 additions & 0 deletions packages/host-arch-riscv64/host-arch-riscv64.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ license: "CC0-1.0+"
homepage: "https://opam.ocaml.org"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
conflict-class: "ocaml-host-arch"
# Temporary, while these packages are not being installed by the compilers on
# non-Windows builds.
available: os = "win32" | arch = "riscv64"
3 changes: 3 additions & 0 deletions packages/host-arch-s390x/host-arch-s390x.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ license: "CC0-1.0+"
homepage: "https://opam.ocaml.org"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
conflict-class: "ocaml-host-arch"
# Temporary, while these packages are not being installed by the compilers on
# non-Windows builds.
available: os = "win32" | arch = "s390x"
3 changes: 3 additions & 0 deletions packages/host-arch-unknown/host-arch-unknown.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ license: "CC0-1.0+"
homepage: "https://opam.ocaml.org"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
conflict-class: "ocaml-host-arch"
# Temporary, while these packages are not being installed by the compilers on
# non-Windows builds.
available: arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64"
3 changes: 3 additions & 0 deletions packages/host-arch-x86_32/host-arch-x86_32.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ license: "CC0-1.0+"
homepage: "https://opam.ocaml.org"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
conflict-class: "ocaml-host-arch"
# Temporary, while these packages are not being installed by the compilers on
# non-Windows builds.
available: os = "win32" | arch = "x86_32"
3 changes: 3 additions & 0 deletions packages/host-arch-x86_64/host-arch-x86_64.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ license: "CC0-1.0+"
homepage: "https://opam.ocaml.org"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
conflict-class: "ocaml-host-arch"
# Temporary, while these packages are not being installed by the compilers on
# non-Windows builds.
available: os = "win32" | arch = "x86_64"
1 change: 1 addition & 0 deletions packages/host-system-mingw/host-system-mingw.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ license: "CC0-1.0+"
homepage: "https://opam.ocaml.org"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
conflict-class: "ocaml-host-system"
available: os = "win32"
1 change: 1 addition & 0 deletions packages/host-system-msvc/host-system-msvc.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ license: "CC0-1.0+"
homepage: "https://opam.ocaml.org"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
conflict-class: "ocaml-host-system"
available: os = "win32"
1 change: 1 addition & 0 deletions packages/host-system-other/host-system-other.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ license: "CC0-1.0+"
homepage: "https://opam.ocaml.org"
bug-reports: "https://github.com/ocaml/opam-repository/issues"
conflict-class: "ocaml-host-system"
available: os != "win32"
20 changes: 3 additions & 17 deletions packages/ocaml-base-compiler/ocaml-base-compiler.4.13.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,6 @@ depends: [
"base-bigarray" {post}
"base-threads" {post}

# Architecture (non-Windows)
# opam-repository at present requires that ocaml-base-compiler is installed
# using an architecture which matches the machine's, since arch is used in
# available fields. Cross-compilation at this stage is an unstable accident.
"host-arch-arm32" {arch = "arm32" & post}
"host-arch-arm64" {arch = "arm64" & post}
"host-arch-ppc64" {arch = "ppc64" & post}
"host-arch-riscv64" {arch = "riscv64" & post}
"host-arch-s390x" {arch = "s390x" & post}
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

# Port selection (Windows)
# amd64 mingw-w64 / MSVC
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
Expand All @@ -42,8 +27,9 @@ depends: [
("arch-x86_32" {os = "win32"} &
(("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
"system-msvc")) |
# Non-Windows systems
"host-system-other" {os != "win32" & post})
# Non-Windows systems need to install something to satisfy this formula, so
# repeat the base-unix dependency
"base-unix" {os != "win32" & post})

# OCaml with default configuration (no flambda, TSAN, etc.)
"ocaml-options-vanilla" {post}
Expand Down
20 changes: 3 additions & 17 deletions packages/ocaml-base-compiler/ocaml-base-compiler.4.13.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,6 @@ depends: [
"base-bigarray" {post}
"base-threads" {post}

# Architecture (non-Windows)
# opam-repository at present requires that ocaml-base-compiler is installed
# using an architecture which matches the machine's, since arch is used in
# available fields. Cross-compilation at this stage is an unstable accident.
"host-arch-arm32" {arch = "arm32" & post}
"host-arch-arm64" {arch = "arm64" & post}
"host-arch-ppc64" {arch = "ppc64" & post}
"host-arch-riscv64" {arch = "riscv64" & post}
"host-arch-s390x" {arch = "s390x" & post}
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

# Port selection (Windows)
# amd64 mingw-w64 / MSVC
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
Expand All @@ -42,8 +27,9 @@ depends: [
("arch-x86_32" {os = "win32"} &
(("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
"system-msvc")) |
# Non-Windows systems
"host-system-other" {os != "win32" & post})
# Non-Windows systems need to install something to satisfy this formula, so
# repeat the base-unix dependency
"base-unix" {os != "win32" & post})

# OCaml with default configuration (no flambda, TSAN, etc.)
"ocaml-options-vanilla" {post}
Expand Down
20 changes: 3 additions & 17 deletions packages/ocaml-base-compiler/ocaml-base-compiler.4.14.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,6 @@ depends: [
"base-bigarray" {post}
"base-threads" {post}

# Architecture (non-Windows)
# opam-repository at present requires that ocaml-base-compiler is installed
# using an architecture which matches the machine's, since arch is used in
# available fields. Cross-compilation at this stage is an unstable accident.
"host-arch-arm32" {arch = "arm32" & post}
"host-arch-arm64" {arch = "arm64" & post}
"host-arch-ppc64" {arch = "ppc64" & post}
"host-arch-riscv64" {arch = "riscv64" & post}
"host-arch-s390x" {arch = "s390x" & post}
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

# Port selection (Windows)
# amd64 mingw-w64 / MSVC
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
Expand All @@ -42,8 +27,9 @@ depends: [
("arch-x86_32" {os = "win32"} &
(("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
"system-msvc")) |
# Non-Windows systems
"host-system-other" {os != "win32" & post})
# Non-Windows systems need to install something to satisfy this formula, so
# repeat the base-unix dependency
"base-unix" {os != "win32" & post})

# OCaml with default configuration (no flambda, TSAN, etc.)
"ocaml-options-vanilla" {post}
Expand Down
20 changes: 3 additions & 17 deletions packages/ocaml-base-compiler/ocaml-base-compiler.4.14.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,6 @@ depends: [
"base-bigarray" {post}
"base-threads" {post}

# Architecture (non-Windows)
# opam-repository at present requires that ocaml-base-compiler is installed
# using an architecture which matches the machine's, since arch is used in
# available fields. Cross-compilation at this stage is an unstable accident.
"host-arch-arm32" {arch = "arm32" & post}
"host-arch-arm64" {arch = "arm64" & post}
"host-arch-ppc64" {arch = "ppc64" & post}
"host-arch-riscv64" {arch = "riscv64" & post}
"host-arch-s390x" {arch = "s390x" & post}
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

# Port selection (Windows)
# amd64 mingw-w64 / MSVC
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
Expand All @@ -42,8 +27,9 @@ depends: [
("arch-x86_32" {os = "win32"} &
(("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
"system-msvc")) |
# Non-Windows systems
"host-system-other" {os != "win32" & post})
# Non-Windows systems need to install something to satisfy this formula, so
# repeat the base-unix dependency
"base-unix" {os != "win32" & post})

# OCaml with default configuration (no flambda, TSAN, etc.)
"ocaml-options-vanilla" {post}
Expand Down
20 changes: 3 additions & 17 deletions packages/ocaml-base-compiler/ocaml-base-compiler.4.14.2/opam
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,6 @@ depends: [
"base-bigarray" {post}
"base-threads" {post}

# Architecture (non-Windows)
# opam-repository at present requires that ocaml-base-compiler is installed
# using an architecture which matches the machine's, since arch is used in
# available fields. Cross-compilation at this stage is an unstable accident.
"host-arch-arm32" {arch = "arm32" & post}
"host-arch-arm64" {arch = "arm64" & post}
"host-arch-ppc64" {arch = "ppc64" & post}
"host-arch-riscv64" {arch = "riscv64" & post}
"host-arch-s390x" {arch = "s390x" & post}
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

# Port selection (Windows)
# amd64 mingw-w64 / MSVC
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
Expand All @@ -42,8 +27,9 @@ depends: [
("arch-x86_32" {os = "win32"} &
(("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
"system-msvc")) |
# Non-Windows systems
"host-system-other" {os != "win32" & post})
# Non-Windows systems need to install something to satisfy this formula, so
# repeat the base-unix dependency
"base-unix" {os != "win32" & post})

# OCaml with default configuration (no flambda, TSAN, etc.)
"ocaml-options-vanilla" {post}
Expand Down
20 changes: 3 additions & 17 deletions packages/ocaml-base-compiler/ocaml-base-compiler.5.0.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,16 @@ depends: [
"base-domains" {post}
"base-nnp" {post}

# Architecture (non-Windows)
# opam-repository at present requires that ocaml-base-compiler is installed
# using an architecture which matches the machine's, since arch is used in
# available fields. Cross-compilation at this stage is an unstable accident.
"host-arch-arm32" {arch = "arm32" & post}
"host-arch-arm64" {arch = "arm64" & post}
"host-arch-ppc64" {arch = "ppc64" & post}
"host-arch-riscv64" {arch = "riscv64" & post}
"host-arch-s390x" {arch = "s390x" & post}
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

# Port selection (Windows)
# amd64 mingw-w64 only
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
"system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
# i686 mingw-w64 only
("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" &
"system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & post}) |
# Non-Windows systems
"host-system-other" {os != "win32" & post})
# Non-Windows systems need to install something to satisfy this formula, so
# repeat the base-unix dependency
"base-unix" {os != "win32" & post})

# OCaml with default configuration (no flambda, TSAN, etc.)
"ocaml-options-vanilla" {post}
Expand Down
20 changes: 3 additions & 17 deletions packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,16 @@ depends: [
"base-domains" {post}
"base-nnp" {post}

# Architecture (non-Windows)
# opam-repository at present requires that ocaml-base-compiler is installed
# using an architecture which matches the machine's, since arch is used in
# available fields. Cross-compilation at this stage is an unstable accident.
"host-arch-arm32" {arch = "arm32" & post}
"host-arch-arm64" {arch = "arm64" & post}
"host-arch-ppc64" {arch = "ppc64" & post}
"host-arch-riscv64" {arch = "riscv64" & post}
"host-arch-s390x" {arch = "s390x" & post}
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

# Port selection (Windows)
# amd64 mingw-w64 only
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
"system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) |
# i686 mingw-w64 only
("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" &
"system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) |
# Non-Windows systems
"host-system-other" {os != "win32" & post})
# Non-Windows systems need to install something to satisfy this formula, so
# repeat the base-unix dependency
"base-unix" {os != "win32" & post})

# OCaml with default configuration (no flambda, TSAN, etc.)
"ocaml-options-vanilla" {post}
Expand Down
20 changes: 3 additions & 17 deletions packages/ocaml-base-compiler/ocaml-base-compiler.5.1.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,16 @@ depends: [
"base-domains" {post}
"base-nnp" {post}

# Architecture (non-Windows)
# opam-repository at present requires that ocaml-base-compiler is installed
# using an architecture which matches the machine's, since arch is used in
# available fields. Cross-compilation at this stage is an unstable accident.
"host-arch-arm32" {arch = "arm32" & post}
"host-arch-arm64" {arch = "arm64" & post}
"host-arch-ppc64" {arch = "ppc64" & post}
"host-arch-riscv64" {arch = "riscv64" & post}
"host-arch-s390x" {arch = "s390x" & post}
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

# Port selection (Windows)
# amd64 mingw-w64 only
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
"system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) |
# i686 mingw-w64 only
("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" &
"system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) |
# Non-Windows systems
"host-system-other" {os != "win32" & post})
# Non-Windows systems need to install something to satisfy this formula, so
# repeat the base-unix dependency
"base-unix" {os != "win32" & post})

# OCaml with default configuration (no flambda, TSAN, etc.)
"ocaml-options-vanilla" {post}
Expand Down
20 changes: 3 additions & 17 deletions packages/ocaml-base-compiler/ocaml-base-compiler.5.2.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,16 @@ depends: [
"base-domains" {post}
"base-nnp" {post}

# Architecture (non-Windows)
# opam-repository at present requires that ocaml-base-compiler is installed
# using an architecture which matches the machine's, since arch is used in
# available fields. Cross-compilation at this stage is an unstable accident.
"host-arch-arm32" {arch = "arm32" & post}
"host-arch-arm64" {arch = "arm64" & post}
"host-arch-ppc64" {arch = "ppc64" & post}
"host-arch-riscv64" {arch = "riscv64" & post}
"host-arch-s390x" {arch = "s390x" & post}
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

# Port selection (Windows)
# amd64 mingw-w64 only
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
"system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) |
# i686 mingw-w64 only
("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" &
"system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) |
# Non-Windows systems
"host-system-other" {os != "win32" & post})
# Non-Windows systems need to install something to satisfy this formula, so
# repeat the base-unix dependency
"base-unix" {os != "win32" & post})

# OCaml with default configuration (no flambda, TSAN, etc.)
"ocaml-options-vanilla" {post}
Expand Down
Loading