diff --git a/CHANGES b/CHANGES index 191c3a88927..07400cd38d5 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,17 @@ Changes prefixed with "(*)" are potentially breaking to scripts or existing repositories (changes that are automatically handled by the format upgrade tools are not marked). +2.0.0~rc2 +* Fixes +* Much faster CUDF universe loading +* Much faster `opam env` and similar commands +* Added `opam admin check` for integrity checks on package repositories +* Added the ability to setup scripts on `opam init` from `.opamrc` +* Setup wrappers to sandbox builds based on `bubblewrap` by default, on Linux +* Windows support for many aspects including parallel processes, environment + variables setup, color console and utf8 (using specific C stubs) +* Better detection of the running shell + 2.0.0~rc * Fixes * Support compiling on OCaml 4.06.0 diff --git a/configure.ac b/configure.ac index 34638a25e6c..122b0807e79 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(opam,2.0.0~rc) +AC_INIT(opam,2.0.0~rc2) AC_COPYRIGHT(Copyright 2012-2017 OcamlPro SAS) AC_CONFIG_MACRO_DIR([m4]) diff --git a/doc/pages/Upgrade_guide.md b/doc/pages/Upgrade_guide.md index 5e7a9d2fcc9..61e82c7be29 100644 --- a/doc/pages/Upgrade_guide.md +++ b/doc/pages/Upgrade_guide.md @@ -87,9 +87,9 @@ doesn't affect the pinned package. - [`opam install --destdir`](man/opam-install.html#lbAF) can be used to copy build artefacts of given packages to an external prefix -- __sandboxing__ of package build/install/remove commands is enabled by default - on Linux. You may need to install the - [bubblewrap](https://github.com/projectatomic/bubblewrap) tool for this. +- __sandboxing__: on Linux, all package commands will now be sandboxed by + default. The [`bubblewrap`](https://github.com/projectatomic/bubblewrap) tool + is now required to this end. ## File formats diff --git a/opam-client.opam b/opam-client.opam index 80d1a737db7..20e3c7622f4 100644 --- a/opam-client.opam +++ b/opam-client.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.0~rc" +version: "2.0.0~rc2" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Thomas Gazagnaire " @@ -19,8 +19,8 @@ build: [ [make "%{name}%.install"] ] depends: [ - "opam-state" {= "2.0.0~rc"} - "opam-solver" {= "2.0.0~rc"} + "opam-state" {= "2.0.0~rc2"} + "opam-solver" {= "2.0.0~rc2"} "re" {>= "1.7.2"} "cmdliner" {>= "0.9.8"} "jbuilder" {build & >= "1.0+beta18"} diff --git a/opam-core.opam b/opam-core.opam index 5f70d91a2e2..51d7b2a33ef 100644 --- a/opam-core.opam +++ b/opam-core.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.0~rc" +version: "2.0.0~rc2" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Thomas Gazagnaire " diff --git a/opam-devel.opam b/opam-devel.opam index 41e7d65361a..a68f68a28c9 100644 --- a/opam-devel.opam +++ b/opam-devel.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.0~rc" +version: "2.0.0~rc2" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Thomas Gazagnaire " @@ -20,7 +20,7 @@ build: [ ] build-test: [make "tests"] depends: [ - "opam-client" {= "2.0.0~rc"} + "opam-client" {= "2.0.0~rc2"} "cmdliner" {>= "0.9.8"} "jbuilder" {build & >= "1.0+beta18"} ] diff --git a/opam-format.opam b/opam-format.opam index e8b149b01e9..230234a1b3b 100644 --- a/opam-format.opam +++ b/opam-format.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.0~rc" +version: "2.0.0~rc2" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Thomas Gazagnaire " @@ -19,8 +19,8 @@ build: [ [make "%{name}%.install"] ] depends: [ - "opam-core" {= "2.0.0~rc"} - "opam-file-format" {>= "2.0.0~beta5"} + "opam-core" {= "2.0.0~rc2"} + "opam-file-format" {>= "2.0.0~rc2"} "jbuilder" {build & >= "1.0+beta18"} ] available: ocaml-version >= "4.02.3" diff --git a/opam-installer.opam b/opam-installer.opam index 8f541469e86..40841694bda 100644 --- a/opam-installer.opam +++ b/opam-installer.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.0~rc" +version: "2.0.0~rc2" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Thomas Gazagnaire " @@ -21,7 +21,7 @@ build: [ [make "%{name}%.install"] ] depends: [ - "opam-format" {= "2.0.0~rc"} + "opam-format" {= "2.0.0~rc2"} "cmdliner" {>= "0.9.8"} "jbuilder" {build & >= "1.0+beta17"} ] diff --git a/opam-repository.opam b/opam-repository.opam index dd09cbca267..b545bfe3937 100644 --- a/opam-repository.opam +++ b/opam-repository.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.0~rc" +version: "2.0.0~rc2" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Thomas Gazagnaire " @@ -19,7 +19,7 @@ build: [ [make "%{name}%.install"] ] depends: [ - "opam-format" {= "2.0.0~rc"} + "opam-format" {= "2.0.0~rc2"} "jbuilder" {build & >= "1.0+beta17"} ] available: ocaml-version >= "4.02.3" diff --git a/opam-solver.opam b/opam-solver.opam index fbc77fdb946..b6a20331dd9 100644 --- a/opam-solver.opam +++ b/opam-solver.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.0~rc" +version: "2.0.0~rc2" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Thomas Gazagnaire " @@ -19,7 +19,7 @@ build: [ [make "%{name}%.install"] ] depends: [ - "opam-format" {= "2.0.0~rc"} + "opam-format" {= "2.0.0~rc2"} "mccs" {>= "1.1+4"} "dose3" {>= "5"} "cudf" {>= "0.7"} diff --git a/opam-state.opam b/opam-state.opam index bf7e61a0a13..fa72cdb8c0a 100644 --- a/opam-state.opam +++ b/opam-state.opam @@ -1,5 +1,5 @@ opam-version: "1.2" -version: "2.0.0~rc" +version: "2.0.0~rc2" maintainer: "opam-devel@lists.ocaml.org" authors: [ "Thomas Gazagnaire " @@ -19,7 +19,7 @@ build: [ [make "%{name}%.install"] ] depends: [ - "opam-repository" {= "2.0.0~rc"} + "opam-repository" {= "2.0.0~rc2"} "jbuilder" {build & >= "1.0+beta18"} ] available: ocaml-version >= "4.02.3" diff --git a/src/client/opamCommands.ml b/src/client/opamCommands.ml index c6afcfa83fb..82eb4b5b99b 100644 --- a/src/client/opamCommands.ml +++ b/src/client/opamCommands.ml @@ -1494,11 +1494,11 @@ let repository = " ", `add, [], (* using an unbreakable space here will indent the text paragraph at the level of the previous labelled paragraph, which is what we want for our note. *) - "$(b,Note:) By default, the repository is only be added to the current switch. \ - To add a switch to other repositories, you need to use the $(b,--all) or \ - $(b,--set-default) options (see below). If you want to enable a repository \ - only to install of of its switches, you may be looking for \ - $(b,opam switch create --repositories=REPOS)."; + "$(b,Note:) By default, the repository is only added to the current \ + switch. To add a switch to other repositories, you need to use the \ + $(b,--all) or $(b,--set-default) options (see below). If you want to \ + enable a repository only to install of of its switches, you may be \ + looking for $(b,opam switch create --repositories=REPOS)."; "remove", `remove, ["NAME..."], "Unselects the given repositories so that they will not be used to get \ package definitions anymore. With $(b,--all), makes opam forget about \ diff --git a/src/state/opamEnv.ml b/src/state/opamEnv.ml index e667e4455c6..ddf0d05c77d 100644 --- a/src/state/opamEnv.ml +++ b/src/state/opamEnv.ml @@ -190,7 +190,7 @@ let compute_updates ?(force_path=false) st = let man_path = let open OpamStd.Sys in match os () with - | OpenBSD | NetBSD | FreeBSD -> + | OpenBSD | NetBSD | FreeBSD | Darwin | DragonFly -> [] (* MANPATH is a global override on those, so disabled for now *) | _ -> ["MANPATH", EqColon,