Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.1.1 backported commits #4792

Merged
merged 33 commits into from
Oct 29, 2021
Merged

2.1.1 backported commits #4792

merged 33 commits into from
Oct 29, 2021

Conversation

rjbou
Copy link
Collaborator

@rjbou rjbou commented Aug 9, 2021

Todo

Pull requests

@rjbou rjbou added this to the 2.1.1 milestone Aug 9, 2021
@rjbou rjbou added this to PR in Progress in Opam 2.1.x via automation Aug 9, 2021
@rjbou rjbou moved this from PR in Progress to PR To review in Opam 2.1.x Sep 27, 2021
@rjbou rjbou moved this from PR To review to PR Finalised in Opam 2.1.x Oct 6, 2021
kit-ty-kate and others added 24 commits October 21, 2021 18:40
The sandbox will attempt to mount the current working directory which
may fail (and which we don't necessarily have any business doing).
Handle empty environment variable updates
The rpcndr.h header includes a typedef for byte which gets messed up when
combined with using namespace std and C++17's byte type.
packages option with cli 2.0, and specific error message with cli 2.1
…tions and argument handling (avail on cli 2.0)
For environment variables which can be split (e.g. `PATH` on `:`),
OpamEnv.unzip_to attempts to find the point in the variable at which a
value was added. This is fine if a _single_ value was added, but fails
if the addition was multiple values (for example, if a setenv
instruction added two directories to `PATH` in one `+=`).

This is fixed by first splitting the value being searched according to
the same rule as the environmen variable and ensuring they all match in
order.
When a package is installed, the switch environment is recomputed and
written, but if the setenv fields referred to package variables just
written to .config then these weren't available as the switch state
didn't include the new config file.

Subsequent calls to opam would then fix the issue as the .config file
will have been loaded with the switch state.
rjbou and others added 2 commits October 27, 2021 16:12
There's an ongoing issue in OCaml with the recent versions of the VS
2019 linker which need resolving. This should be reverted once that's
done.
@hannesm
Copy link
Member

hannesm commented Oct 29, 2021

any timeline when the 2.1.1 release will happen? :)

@dra27
Copy link
Member

dra27 commented Oct 29, 2021

Later today 😁 Or possibly early next week...

@rjbou rjbou merged commit 838b017 into ocaml:2.1 Oct 29, 2021
Opam 2.1.x automation moved this from PR Finalised to Done Oct 29, 2021
@hannesm
Copy link
Member

hannesm commented Nov 8, 2021

thanks for tagging the release :) could you submit the new packages to opam-repository? thanks! :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Opam 2.1.x
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants