Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion .github/scripts/main/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ if [ "$OPAM_DEPENDS" = "1" ]; then
OCAMLVER=$(ocamlc -version)

(set +x; echo -en "::group::depends\r") 2>/dev/null
VERSION="2.4.1"
VERSION="2.5.0"
opam_libs=$(opam show . -f name 2>/dev/null)
depends_on=$(echo "$opam_libs" | sed "s/\$/.${VERSION}/" | paste -sd, -)
packages=$(echo "$opam_libs" | while read lib; do
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.ml
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ let main oc : unit =
("OPAM12CACHE", "~/.cache/opam1.2/cache");
(* These should be identical to the values in appveyor.yml *)
("OPAM_REPO", "https://github.com/ocaml/opam-repository.git");
("OPAM_TEST_REPO_SHA", "38a1469dbbc69c770e534e26f79c97256a442b71");
("OPAM_TEST_REPO_SHA", "eb45f7ec868b0ffc828b9d59cccc72cfec100333");
("OPAM_REPO_SHA", "38a1469dbbc69c770e534e26f79c97256a442b71");
("SOLVER", "");
(* Cygwin configuration *)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/depexts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ defaults:
shell: bash

env:
OPAMVERSION: 2.4.1
OPAMVERSION: 2.5.0
OPAM_REPO: https://github.com/ocaml/opam-repository.git
OPAM_REPO_SHA: 38a1469dbbc69c770e534e26f79c97256a442b71
OPAM_REPO_SHA: eb45f7ec868b0ffc828b9d59cccc72cfec100333

jobs:
opam-cache:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
OPAMBSROOT: ~/.cache/.opam.cached
OPAM12CACHE: ~/.cache/opam1.2/cache
OPAM_REPO: https://github.com/ocaml/opam-repository.git
OPAM_TEST_REPO_SHA: 38a1469dbbc69c770e534e26f79c97256a442b71
OPAM_TEST_REPO_SHA: eb45f7ec868b0ffc828b9d59cccc72cfec100333
OPAM_REPO_SHA: 38a1469dbbc69c770e534e26f79c97256a442b71
SOLVER:
CYGWIN_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
Expand Down
6 changes: 6 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ repositories (changes that are automatically handled by the format upgrade tools
are not marked). Those prefixed with "(+)" are new command/option (since
2.1.0~alpha2).

2.5.0:
* (no difference compared to 2.5.0~rc1)

2.5.0~rc1:
* (no difference compared to 2.5.0~beta1)

2.5.0~beta1:
* Allow the macOS sandbox to write in the `/var/folders/` and `/var/db/mds/`
directories as it is required by some of macOS core tools
Expand Down
6 changes: 3 additions & 3 deletions doc/pages/Install.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ Sources of the latest stable version of opam are available on Github:
You can also download the full archives, including opam dependencies (these
don't require any extra downloads):

* [2.4.1](https://github.com/ocaml/opam/releases/download/2.4.1/opam-full-2.4.1.tar.gz)
- MD5: 57df5d14234be1ba65ad6acb3a22e860
- SHA512: 25e0b60c214f94c91780658ce4af149c89549b6d164d07739eca2e8b1c2ea2086e17a64ba486c4a8365fcdf532729848f410f63e3579f2bdd564fc333ab3f787
* [2.5.0](https://github.com/ocaml/opam/releases/download/2.5.0/opam-full-2.5.0.tar.gz)
- MD5: 300a43aca6a20c984100ec6855c2f979
- SHA512: 4e47b03e22de3ab975f1e14b4a6b8e98f159a065be8f9d56f110e6a2a5275b42d4646350b230f912b057b768f182225db24d5343da41a716d0e9cdc1cb435c54

Follow the instructions in the included
[`README.md`](https://github.com/ocaml/opam#readme) to get opam built and
Expand Down
2 changes: 1 addition & 1 deletion opam-client.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
version: "2.6.0~alpha1~dev"
synopsis: "Client library for opam 2.4"
synopsis: "Client library for opam 2.6"
description: """
Actions on the opam root, switches, installations, and front-end.
"""
Expand Down
2 changes: 1 addition & 1 deletion opam-core.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
version: "2.6.0~alpha1~dev"
synopsis: "Core library for opam 2.4"
synopsis: "Core library for opam 2.6"
description:
"Small standard library extensions, and generic system interaction modules used by opam."
maintainer: "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion opam-devel.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
version: "2.6.0~alpha1~dev"
synopsis: "Bootstrapped development binary for opam 2.4"
synopsis: "Bootstrapped development binary for opam 2.6"
description: """
This package compiles (bootstraps) opam. For consistency and safety of the installation, the binaries are not installed into the PATH, but into lib/opam-devel, from where the user can manually install them system-wide.
"""
Expand Down
2 changes: 1 addition & 1 deletion opam-format.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
version: "2.6.0~alpha1~dev"
synopsis: "Format library for opam 2.4"
synopsis: "Format library for opam 2.6"
description: """
Definition of opam datastructures and its file interface.
"""
Expand Down
2 changes: 1 addition & 1 deletion opam-repository.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
version: "2.6.0~alpha1~dev"
synopsis: "Repository library for opam 2.4"
synopsis: "Repository library for opam 2.6"
description: """
This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends.
"""
Expand Down
2 changes: 1 addition & 1 deletion opam-solver.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
version: "2.6.0~alpha1~dev"
synopsis: "Solver library for opam 2.4"
synopsis: "Solver library for opam 2.6"
description: """
Solver and Cudf interaction. This library is based on the Cudf and Dose libraries, and handles calls to the external solver from opam.
"""
Expand Down
2 changes: 1 addition & 1 deletion opam-state.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
version: "2.6.0~alpha1~dev"
synopsis: "State library for opam 2.4"
synopsis: "State library for opam 2.6"
description: """
Handling of the ~/.opam hierarchy, repository and switch states.
"""
Expand Down
Loading