Merge pull request #4792 from rjbou/211

2.1.1 backported commits

.github/scripts/main.sh

@@ -154,6 +154,9 @@ fi
     # to be moved forwards when a new version of OCaml is added to ensure that the
     # ocaml-system package is available at the correct version.
     opam init --bare default git+https://github.com/ocaml/opam-repository#$OPAM_TEST_REPO_SHA
+    cat >> $(opam var root --global 2>/dev/null)/config <<EOF
+archive-mirrors: "https://opam.ocaml.org/cache"
+EOF
     opam switch create default ocaml-system
     eval $(opam env)
     opam install lwt

.github/scripts/preamble.sh

@@ -39,6 +39,11 @@ init-bootstrap () {
     export OPAMROOT=$OPAMBSROOT
     # The system compiler will be picked up
     opam init --yes --no-setup git+https://github.com/ocaml/opam-repository#$OPAM_REPO_SHA
+
+    cat >> $OPAMROOT/config <<EOF
+archive-mirrors: "https://opam.ocaml.org/cache"
+EOF
+
     eval $(opam env)
 #    opam update
     CURRENT_SWITCH=$(opam var switch)

.github/workflows/ci.yml

@@ -8,9 +8,9 @@ env:
   OPAM12CACHE: ~/.cache/opam1.2/cache
   # This should be identical to the value in appveyor.yml
   OPAM_TEST_REPO_SHA: b02110b549a0b5275806ce27444fabac71093a0e
-  OPAM_REPO_SHA: b02110b549a0b5275806ce27444fabac71093a0e
+  OPAM_REPO_SHA: 9355b17f9c22a2b44740e3fc5f25f24771929f26
   # Default ocaml version for some jobs
-  OCAML_VERSION: 4.11.2
+  OCAML_VERSION: 4.12.0
   ## variables for cache paths
   GH_OCAML_CACHE: ~/.cache/ocaml-local/**
   SOLVER:
@@ -113,7 +113,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        ocamlv: [ 4.11.2 ]
+        ocamlv: [ 4.12.0 ]
       fail-fast: false
     env:
       OPAM_TEST: 1
@@ -165,7 +165,7 @@ jobs:
       matrix:
 #        os: [ ubuntu-latest, macos-latest ]
         os: [ ubuntu-latest ]
-        ocamlv: [ 4.11.2 ]
+        ocamlv: [ 4.12.0 ]
       fail-fast: false
     steps:
     - name: install deps
@@ -195,12 +195,12 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        ocamlv: [ 4.11.2 ]
+        ocamlv: [ 4.12.0 ]
         solver: [ z3, 0install ]
       fail-fast: false
     env:
       SOLVER: ${{ matrix.solver }}
-      OPAM_REPO_SHA: 02ead5a557
+      OPAM_REPO_SHA: 9355b17f9c22a2b44740e3fc5f25f24771929f26
       OPAMBSROOT: ~/.cache/opam.${{ matrix.solver }}.cached
     steps:
     - uses: actions/checkout@v2
@@ -245,7 +245,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        ocamlv: [ 4.11.2 ]
+        ocamlv: [ 4.12.0 ]
       fail-fast: false
     steps:
     - name: install deps

CHANGES

@@ -3,6 +3,32 @@ 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.1.1:
+* Fix typo in error message for opam var [#4786 @kit-ty-kate - fix #4785]
+* Run the sandbox check in the temporary directory [#4787 @dra27 - fix #4783]
+* OpamSystem: avoid calling Unix.environment at top level [#4789 @hannesm]
+* Homebrew: Add support for casks and full-names [#4801 @kit-ty-kate]
+* Fix the cold target in presence of an older OCaml compiler version on macOS
+  [#4802 @kit-ty-kate - fix #4801]
+* Archlinux: handle virtual package detection [#4833 @rjbou - partial fix #4759]
+* Disable the detection of available packages on RHEL-based distributions.
+  This fixes an issue on RHEL-based distributions where yum list used to detect
+  available and installed packages would wait for user input without showing
+  any output and/or fail in some cases [#4791 @kit-ty-kate - fixes #4790]
+* Handle empty environment variable updates - missed cherry-pick from 2.0
+  [#4840 @dra27]
+* Fix vendored build on mingw-w64 with g++ 11.2 [#4835 @dra27]
+* Put back support for switch creation with packages argument and
+  `--packages` option with cli 2.0, and a specific error message for cli 2.1
+  [#4853 @rjbou - fix #4843]
+* Fix reverting environment additions to PATH-like variables when several dirs
+  added at once [#4861 @dra27]
+* Fix dose3 download url since gforge is gone [#4870 @avsm]
+* Ensure setenv can use package variables defined during the build
+  [#4841 @dra27]
+* Fix `set-invariant: default repos were loaded instead of switch repos
+  [#4866 @rjbou]
+
 2.1.0:
 * Set DEBIAN_FRONTEND=noninteractive for unsafe-yes confirmation level
   [#4735 @dra27 - partially fix #4731]

Makefile

@@ -48,7 +48,7 @@ src_ext/dune-local/dune.exe: src_ext/dune-local.stamp $(DUNE_SECONDARY)
 ifeq ($(DUNE_SECONDARY),)
 	cd src_ext/dune-local && ocaml bootstrap.ml
 else
-	cd src_ext/dune-local && ( unset OCAMLLIB ; PATH="$(dir $(realpath $(DUNE_SECONDARY))):$$PATH" ../../$(DUNE_SECONDARY) bootstrap.ml )
+	cd src_ext/dune-local && ( unset OCAMLLIB ; unset CAML_LD_LIBRARY_PATH ; PATH="$(dir $(realpath $(DUNE_SECONDARY))):$$PATH" ../../$(DUNE_SECONDARY) bootstrap.ml )
 endif
 
 src_ext/dune-local.stamp:
@@ -258,12 +258,12 @@ src_ext/secondary/ocaml/bin/ocaml:
 	env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS="--disable-ocamldoc --disable-debug-runtime --disable-debugger" BOOTSTRAP_OPT_TARGET=opt BOOTSTRAP_ROOT=../.. BOOTSTRAP_DIR=src_ext/secondary ./shell/bootstrap-ocaml.sh $(OCAML_PORT)
 
 cold: compiler
-	env PATH="`pwd`/bootstrap/ocaml/bin:$$PATH" ./configure --enable-cold-check $(CONFIGURE_ARGS)
-	env PATH="`pwd`/bootstrap/ocaml/bin:$$PATH" $(MAKE) lib-ext
-	env PATH="`pwd`/bootstrap/ocaml/bin:$$PATH" $(MAKE)
+	env PATH="`pwd`/bootstrap/ocaml/bin:$$PATH" CAML_LD_LIBRARY_PATH= ./configure --enable-cold-check $(CONFIGURE_ARGS)
+	env PATH="`pwd`/bootstrap/ocaml/bin:$$PATH" CAML_LD_LIBRARY_PATH= $(MAKE) lib-ext
+	env PATH="`pwd`/bootstrap/ocaml/bin:$$PATH" CAML_LD_LIBRARY_PATH= $(MAKE)
 
 cold-%:
-	env PATH="`pwd`/bootstrap/ocaml/bin:$$PATH" $(MAKE) $*
+	env PATH="`pwd`/bootstrap/ocaml/bin:$$PATH" CAML_LD_LIBRARY_PATH= $(MAKE) $*
 
 .PHONY: run-appveyor-test
 run-appveyor-test:

appveyor.yml

@@ -24,7 +24,8 @@ environment:
       OCAML_PORT: msvc
       DEP_MODE: lib-pkg
       GIT_FOR_WINDOWS: 1
-    - OCAML_PORT: msvc64
+    - appveyor_build_worker_image: Visual Studio 2017
+      OCAML_PORT: msvc64
     - OCAML_PORT: mingw
     - OCAML_PORT: mingw64
       DEP_MODE: lib-pkg

configure.ac

@@ -1,5 +1,5 @@
 dnl The line below must be formatted AC_INIT(opam,VERSION) with no extra spaces
-AC_INIT(opam,2.1.0)
+AC_INIT(opam,2.1.1)
 AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])

opam-client.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.0"
+version: "2.1.1"
 synopsis: "Client library for opam 2.1"
 description: """
 Actions on the opam root, switches, installations, and front-end.

opam-core.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.0"
+version: "2.1.1"
 synopsis: "Core library for opam 2.1"
 description: """
 Small standard library extensions, and generic system interaction modules used by opam.

opam-devel.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.0"
+version: "2.1.1"
 synopsis: "Bootstrapped development binary for opam 2.1"
 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.

opam-format.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.0"
+version: "2.1.1"
 synopsis: "Format library for opam 2.1"
 description: """
 Definition of opam datastructures and its file interface.

opam-installer.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.0"
+version: "2.1.1"
 synopsis: "Installation of files to a prefix, following opam conventions"
 description: """
 opam-installer is a small tool that can read *.install files, as defined by opam [1], and execute them to install or remove package files without going through opam.

opam-repository.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.0"
+version: "2.1.1"
 synopsis: "Repository library for opam 2.1"
 description: """
 This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends.

opam-solver.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.0"
+version: "2.1.1"
 synopsis: "Solver library for opam 2.1"
 description: """
 Solver and Cudf interaction. This library is based on the Cudf and Dose libraries, and handles calls to the external solver from opam.

opam-state.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.0"
+version: "2.1.1"
 synopsis: "State library for opam 2.1"
 description: """
 Handling of the ~/.opam hierarchy, repository and switch states.

opam.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.0"
+version: "2.1.1"
 synopsis: "Meta-package for Dune"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [