Skip to content
Commits on Source (11)
Show whitespace changes
Inline Side-by-side
.gitattributes
View file @ f80c14da
......@@ -4,7 +4,7 @@
# Shell scripts, autoconf, etc. must have LF endings, even on Windows
*.sh text eol=lf
*.zsh text eol=lf
configure text eol=lf
configure text eol=lf -diff
configure.ac text eol=lf
msvs-detect text eol=lf
check_linker text eol=lf
......
.travis-ci.sh
View file @ f80c14da
......@@ -29,7 +29,7 @@ init-bootstrap () {
eval $(opam env)
# extlib is installed, since UChar.cmi causes problems with the search
# order. See also the removal of uChar and uTF8 in src_ext/jbuild-extlib-src
opam install cohttp-lwt-unix ssl cmdliner dose3 cudf.0.9 opam-file-format re extlib dune 'mccs>=1.1+5' --yes
opam install ssl cmdliner dose3 cudf.0.9 opam-file-format re extlib dune 'mccs>=1.1+5' --yes
fi
rm -f "$OPAMBSROOT"/log/*
}
......@@ -102,7 +102,10 @@ EOF
tar -xzf ocaml-$OCAML_VERSION.tar.gz
cd ocaml-$OCAML_VERSION
if [[ $OPAM_TEST -ne 1 ]] ; then
CONFIGURE_SWITCHES="-no-ocamldoc -no-ocamlbuild"
CONFIGURE_SWITCHES="-no-ocamldoc"
if [[ "$OCAML_VERSION" != "4.02.3" ]] ; then
CONFIGURE_SWITCHES="$CONFIGURE_SWITCHES -no-ocamlbuild"
fi
fi
./configure --prefix ~/local -no-graph -no-debugger ${CONFIGURE_SWITCHES:-}
if [[ $OPAM_TEST -eq 1 ]] ; then
......@@ -156,6 +159,7 @@ export OCAMLRUNPARAM=b
make lib-ext
fi
make all
make man
rm -f ~/local/bin/opam
make install
......@@ -167,10 +171,10 @@ export OCAMLRUNPARAM=b
done
# Compile and run opam-rt
cd ~/build
wget https://github.com/ocaml/opam-rt/archive/$TRAVIS_PULL_REQUEST_BRANCH.tar.gz -O opam-rt.tar.gz || \
wget https://github.com/ocaml/opam-rt/archive/master.tar.gz -O opam-rt.tar.gz
wget https://github.com/ocaml/opam-rt/archive/opam2.0.tar.gz -O opam-rt.tar.gz
tar -xzf opam-rt.tar.gz
cd opam-rt-*
opam install ./opam-rt.opam --deps-only -y
make
opam switch default
......
CHANGES
View file @ f80c14da
......@@ -2,6 +2,36 @@ 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.5:
* Bump src_ext Dune to 1.6.3, allows compilation with OCaml 4.08.0. [#3887 @dra27]
* Support Dune 1.7.0 and later [#3888 @dra27 - fix #3870]
* Bump the ocaml_mccs lib-ext, to include latest changes [#3896 @AltGr]
* Fix cppo detection in configure [#3917 @dra27]
* Read jobs variable from OpamStateConfig [#3916 @dra27]
* Linting:
* add check upstream option [#3758 @rjbou]
* add warning for with-test in run-test field [#3765, #3860 @rjbou]
* fix misleading `doc` filter warning [#3871 @rjbou]
* Fix typos [#3891 @dra27, @mehdid]
2.0.4:
* Add (rudimentary) error handling to `make man`
* Sandboxing on MacOS: considering the possibility that TMPDIR in unset
* display: Fix opam var display
* pin:
* update source of (version) pinned directory
* fix `--ignore-pin-depends` with autopin
* fix pinnings not installing/upgrading already pinned packages (introduced in 2.0.2)
* opam clean: Ignore errors trying to remove directories
* remove wrong mismatching extra-files warning
* urls: fix hg opam 1.2 url parsing
* lint: warning error 47 on descr first line
* dirtrack: fix precise tracking mode
* system:
* lock & signals: don't interrupt at non terminal signals
* shell: fix fish manpath setting
* git: use git -c diff.noprefix=false diff in case it is defined in user config
2.0.3:
* Fix manpage remaining $ (OPAMBESTEFFORT)
* Fix OPAMROOTISOK handling
......@@ -331,7 +361,7 @@ are not marked).
1.2.1
* Non-system compiler definitions without source are now allowed
* Better handling of compiler "base" packages allows to move build instructions
* Better handling of compiler "base" packages allows one to move build instructions
from compiler definitions to packages
* Rewritten action resolution mechanism to be based on atomic actions.
Actions are not aborted anymore on first failure when there is no
......@@ -552,12 +582,12 @@ are not marked).
* Improve the syntax of filters
* Add a `messages` field
* Add a `--jobs` command line option and add `%{jobs}%` to be used in OPAM files
* Various improvments in the solver heuristics
* Various improvements in the solver heuristics
* By default, turn-on checking of certificates for downloaded dependency archives: use `./configure --disable-certificate-check` to go back to the previous behavior
* Check the md5sum of downloaded archives when compiling OPAM
* Improved `opam info` command (more information, non-zero error code when no patterns match)
* Display OS and OPAM version on internal errors to ease error reporting
* Fix `opam reinstall` when reinstalling a package wich is a dependency of installed packages (regression introduced in 0.9.5)
* Fix `opam reinstall` when reinstalling a package which is a dependency of installed packages (regression introduced in 0.9.5)
* Export and read `OPAMSWITCH` to be able to call OPAM in different switches
* `opam-client` can now be used in a toplevel
* `-n` now means `--no-setup` and not `--no-checksums` anymore
......@@ -700,7 +730,7 @@ are not marked).
* improve opam-mk-repo
* fix `opam search` to be caseless
* ability to filter some commands (depending on some predicates) in opam file
* improvments when packages disapear upstream
* improvements when packages disappear upstream
* check for ocaml 3.12.1 on configure
* tell the user to unset some potentially dangerous variables when running opam
* fix few git backend issues
......
Makefile
View file @ f80c14da
......@@ -6,7 +6,7 @@ all: opam opam-installer
@
ifeq ($(DUNE),)
DUNE_EXE = src_ext/dune-local/_build/install/default/bin/dune$(EXE)
DUNE_EXE = src_ext/dune-local/_build_bootstrap/install/default/bin/dune$(EXE)
ifeq ($(shell command -v cygpath 2>/dev/null),)
DUNE := $(DUNE_EXE)
else
......@@ -26,7 +26,7 @@ JBUILDER_ARGS ?=
DUNE_ARGS ?= $(JBUILDER_ARGS)
DUNE_PROFILE ?= release
src_ext/dune-local/_build/install/default/bin/dune$(EXE): src_ext/dune-local.stamp
src_ext/dune-local/_build_bootstrap/install/default/bin/dune$(EXE): src_ext/dune-local.stamp
cd src_ext/dune-local && ocaml bootstrap.ml && ./boot.exe --release
src_ext/dune-local.stamp:
......
configure
View file @ f80c14da
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
configure.ac
View file @ f80c14da
dnl The line below must be formatted AC_INIT(opam,VERSION) with no extra spaces
AC_INIT(opam,2.0.3)
AC_INIT(opam,2.0.5)
AC_COPYRIGHT(Copyright 2012-2017 OcamlPro SAS)
AC_CONFIG_MACRO_DIR([m4])
......@@ -215,6 +215,7 @@ AS_IF([test "x${enable_certificate_check}" = "xno"], [
AC_CHECK_PROGS(FETCH,[curl wget],no)
AC_CHECK_TOOL(DUNE,dune)
AC_CHECK_TOOL(CPPO,cppo)
AC_CHECK_TOOL(PATCH,patch)
AC_CHECK_TOOL(BUNZIP2,bunzip2)
......@@ -279,7 +280,6 @@ AC_CHECK_OCAML_PKG(dose3.common,dose.common)
AC_CHECK_OCAML_PKG(dose3.algo,dose.algo)
AC_CHECK_OCAML_PKG([opam-file-format])
AC_CHECK_OCAML_PKG([mccs])
AC_CHECK_OCAML_PKG([cppo])
AS_IF([test "x${with_mccs}" = "xno" && test "x$OCAML_PKG_mccs" != "xno"],
[AC_MSG_ERROR([Option --without-mccs is not available without uninstalling the 'mccs' package])])
......@@ -318,7 +318,6 @@ dnl echo "cudf.......................... ${OCAML_PKG_cudf}"
dnl echo "dose3......................... ${OCAML_PKG_dose3}"
echo
AS_IF([test "x${enable_checks}" != "xno" && {
test "x$OCAML_PKG_extlib" = "xno" ||
test "x$OCAML_PKG_re" = "xno" ||
......@@ -327,7 +326,7 @@ AS_IF([test "x${enable_checks}" != "xno" && {
test "x$OCAML_PKG_cudf" = "xno" ||
test "x$OCAML_PKG_dose3_common" = "xno" ||
test "x$OCAML_PKG_opam_file_format" = "xno" ||
test "x$OCAML_PKG_cppo" = "xno" ||
test "x$CPPO" = "x" ||
test "x$OCAML_PKG_mccs$MCCS_ENABLED" = "xnotrue";}],[
echo "============================================================================"
echo "Some dependencies are missing. If you are just interested in the stand-alone"
......
debian/changelog
View file @ f80c14da
opam (2.0.5-1) UNRELEASED; urgency=medium
* New upstream version 2.0.5
+ Forward-compatibility improvements (OCaml 4.08, Dune 1.7 and later, ...)
+ Numerous bugfixes
* Remove dependency on external CUDF solvers. (Closes: #908203, #907636)
OPAM is already built with an internal solver, which we prefer.
-- Nicolas Braud-Santoni <nicoo@debian.org> Wed, 14 Aug 2019 21:59:51 +0200
opam (2.0.3-1) unstable; urgency=medium
* New (bugfix) upstream release
......
debian/control
View file @ f80c14da
......@@ -4,9 +4,9 @@ Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
Uploaders:
Mehdi Dogguy <mehdi@debian.org>,
Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Nicolas Braud-Santoni <nicoo@debian.org>
Build-Depends:
debhelper (>= 11),
debhelper-compat (= 12),
ocaml-nox (>= 4.3.0~),
ocamlbuild,
cppo (>= 1.6.0),
......@@ -20,13 +20,6 @@ Build-Depends:
libextlib-ocaml-dev,
libocamlgraph-ocaml-dev (>= 1.8),
libopam-file-format-ocaml-dev,
libjsonm-ocaml-dev,
libopam-file-format-ocaml-dev,
aspcud,
rsync,
unzip,
openssl,
git,
curl
Build-Depends-Indep:
texlive-latex-base,
......@@ -36,7 +29,7 @@ Build-Depends-Indep:
texlive-fonts-recommended,
pandoc,
latex-make
Standards-Version: 4.2.1
Standards-Version: 4.4.0
Rules-Requires-Root: no
Homepage: https://opam.ocaml.org
Vcs-Git: https://salsa.debian.org/ocaml-team/opam.git
......@@ -50,7 +43,6 @@ Depends:
${misc:Depends},
opam-doc (= ${source:Version}),
build-essential,
aspcud | mccs | packup,
opam-installer,
bubblewrap [linux-any],
unzip,
......
debian/copyright
View file @ f80c14da
......@@ -2,12 +2,13 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: https://opam.ocaml.org/
Files: *
Copyright: © 2012-2018 OcamlPro
© 2012 INRIA
Copyright: 2012-2019 OcamlPro
2012 INRIA
License: LGPL-3 with linking exception
Files: debian/*
Copyright: © 2013 Mehdi Dogguy <mehdi@debian.org>
Copyright: 2013-2019 Mehdi Dogguy <mehdi@debian.org>
2018-2019 Nicolas Braud-Santoni <nicoo@debian.org>
License: GPL-3
The Debian packaging is licensed under the GPL version 3,
see `/usr/share/common-licenses/GPL-3'.
......
debian/opam-installer.lintian-overrides 0 → 100644
View file @ f80c14da
opam-installer: hardening-no-fortify-functions usr/bin/opam-installer
debian/opam.lintian-overrides 0 → 100644
View file @ f80c14da
opam: hardening-no-fortify-functions usr/bin/opam
debian/opam.maintscript 0 → 100644
View file @ f80c14da
dir_to_symlink /usr/share/doc/opam /usr/share/doc/opam-installer 2.0.0-1~ opam
debian/opam.postinst deleted 100644 → 0
View file @ 82ff65c8
#!/bin/sh
set -e
dpkg-maintscript-helper dir_to_symlink \
/usr/share/doc/opam /usr/share/doc/opam-installer \
2.0.0-1~ opam -- "$@"
#DEBHELPER#
\ No newline at end of file
debian/opam.postrm deleted 100644 → 0
View file @ 82ff65c8
#!/bin/sh
set -e
dpkg-maintscript-helper dir_to_symlink \
/usr/share/doc/opam /usr/share/doc/opam-installer \
2.0.0-1~ opam -- "$@"
#DEBHELPER#
\ No newline at end of file
debian/opam.preinst deleted 100644 → 0
View file @ 82ff65c8
#!/bin/sh
set -e
dpkg-maintscript-helper dir_to_symlink \
/usr/share/doc/opam /usr/share/doc/opam-installer \
2.0.0-1~ opam -- "$@"
#DEBHELPER#
\ No newline at end of file
debian/patches/0002-Fix-spelling-error-in-manpage.patch deleted 100644 → 0
View file @ 82ff65c8
From: Mehdi Dogguy <mehdi@debian.org>
Date: Sun, 2 Dec 2018 13:56:15 +0100
Subject: Fix spelling-error-in-manpage
---
CHANGES | 2 +-
doc/pages/External_solvers.md | 2 +-
doc/pages/FAQ.md | 2 +-
doc/pages/Manual.md | 12 ++++++------
doc/pages/Specifying_Solver_Preferences.md | 2 +-
doc/pages/Usage.md | 2 +-
src/client/opamAdminCommand.ml | 2 +-
src/client/opamCommands.ml | 12 ++++++------
src/client/opamConfigCommand.mli | 2 +-
src/client/opamInitDefaults.mli | 2 +-
src/core/opamProcess.ml | 2 +-
src/format/opamFile.ml | 2 +-
src/format/opamVariable.ml | 2 +-
src/state/opamGlobalState.mli | 2 +-
src/state/opamStateConfig.mli | 2 +-
src/state/opamStateTypes.mli | 2 +-
src/state/shellscripts/bwrap.sh | 2 +-
17 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/CHANGES b/CHANGES
index e438db8..f608ac9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -331,7 +331,7 @@ are not marked).
1.2.1
* Non-system compiler definitions without source are now allowed
-* Better handling of compiler "base" packages allows to move build instructions
+* Better handling of compiler "base" packages allows one to move build instructions
from compiler definitions to packages
* Rewritten action resolution mechanism to be based on atomic actions.
Actions are not aborted anymore on first failure when there is no
diff --git a/doc/pages/External_solvers.md b/doc/pages/External_solvers.md
index 63ce79b..6aa071a 100644
--- a/doc/pages/External_solvers.md
+++ b/doc/pages/External_solvers.md
@@ -70,7 +70,7 @@ When you request to install a (set of) package(s), in general you do not expect
### Specifying preferences for opam
-`opam` allows to specify your criteria on the command line, using the `--criteria` option, that will apply only to the current command.
+`opam` allows one to specify your criteria on the command line, using the `--criteria` option, that will apply only to the current command.
For example if you are a very conservative user, you might try issueing the following command:
```
opam install --criteria="-removed,-changed" ...
diff --git a/doc/pages/FAQ.md b/doc/pages/FAQ.md
index 4414767..597ac4b 100644
--- a/doc/pages/FAQ.md
+++ b/doc/pages/FAQ.md
@@ -100,7 +100,7 @@ enabled. Note, however, that:
#### 🐫 Why does ``opam init`` need to add stuff to my init scripts / why is ``eval $(opam env)`` needed?
This is not strictly needed, but by updating your `PATH` and a few specific
-environment variables, allows to:
+environment variables, allows one to:
1. Automatically find executables installed in opam (current switch)
2. Ensure the OCaml tools are going to look at the right places for installed
diff --git a/doc/pages/Manual.md b/doc/pages/Manual.md
index 79c7965..dd70ef8 100644
--- a/doc/pages/Manual.md
+++ b/doc/pages/Manual.md
@@ -92,7 +92,7 @@ selected.
The current switch can be selected in the following ways:
- globally, using `opam switch <switch>`. <span class="opam">opam</span> will use that switch for all
- further commands, except when overriden in one of the following ways.
+ further commands, except when overridden in one of the following ways.
- for local switches, which are external to the opam root, when in the directory
where the switch resides or a descendant.
- by setting the `OPAMSWITCH=<switch>` environment variable, to set it within a
@@ -410,7 +410,7 @@ three scopes:
#### Pre-defined variables
The following variables are dynamically defined by opam, but can still be
-overriden from configuration. You can get the list of currently defined
+overridden from configuration. You can get the list of currently defined
variables by running:
```
@@ -679,7 +679,7 @@ repositories or initial distributions or packages.
#### repo
<a id="Repospecification"></a>
-The `repo` file is placed at the root of a repository, and allows to specify
+The `repo` file is placed at the root of a repository, and allows one to specify
some specifics of the repository. It has the following optional fields:
* <a id="repofield-opam-version">`opam-version: <string>`</a>:
@@ -730,7 +730,7 @@ The default, built-in initial config of <span class="opam">opam</span> can be se
- <a id="opamrcfield-init-scripts">`init-scripts: [ [ <string> <string> ] { <filter> } ... ]`</a>:
These scripts will be written verbatim into the hook directory
(`~/.opam/opam-init/hooks`) upon initialisation. The first string is the file
- name of the script, the second its raw contents, and the filter allows to
+ name of the script, the second its raw contents, and the filter allows one to
limit the creation of the script to specific configurations.
- [`jobs:`](#configfield-jobs),
[`download-command:`](#configfield-download-command),
@@ -963,7 +963,7 @@ files.
class="opam">opam</span> ecosystem, for various systems. Each
`[ <string> ... ] { <filter> }` element declares the strings to the left as
identifiers to required system-managed packages, while the filter to the right
- allows to select the systems they will be active on.
+ allows one to select the systems they will be active on.
The filters typically use variables [`arch`](#opamvar-arch),
[`os`](#opamvar-os), [`os-distribution`](#opamvar-os-distribution),
@@ -986,7 +986,7 @@ files.
- <a id="opamfield-post-messages">
`post-messages: [ <string> { <filter> } ... ]`</a>:
- allows to print specific messages to the user after the end of installation.
+ allows one to print specific messages to the user after the end of installation.
The special boolean variable `failure` is defined in the scope of the filter,
and can be used to print messages in case there was an error (typically, a
hint on how it can be resolved, or a link to an open issue). `success` is also
diff --git a/doc/pages/Specifying_Solver_Preferences.md b/doc/pages/Specifying_Solver_Preferences.md
index 45f54b1..24b4547 100644
--- a/doc/pages/Specifying_Solver_Preferences.md
+++ b/doc/pages/Specifying_Solver_Preferences.md
@@ -34,7 +34,7 @@ When you request to install a (set of) package(s), in general you do not expect
### Specifying preferences for opam
-Recent versions of `opam` allow to specify your criteria on the command line, using the `--criteria` option, that will apply only to the current command.
+Recent versions of `opam` allow one to specify your criteria on the command line, using the `--criteria` option, that will apply only to the current command.
For example if you are a very conservative user, you might try issueing the following command:
```
opam install --criteria="-removed,-changed" ...
diff --git a/doc/pages/Usage.md b/doc/pages/Usage.md
index 1bd0686..e7bbf5d 100644
--- a/doc/pages/Usage.md
+++ b/doc/pages/Usage.md
@@ -111,7 +111,7 @@ Creating a new switch requires re-compiling OCaml, unless you use the
### opam pin
-This command allows to pin a package to a specific version, but has been
+This command allows one to pin a package to a specific version, but has been
extended to allow much more than that.
The syntax is
diff --git a/src/client/opamAdminCommand.ml b/src/client/opamAdminCommand.ml
index db100ac..65c8fd4 100644
--- a/src/client/opamAdminCommand.ml
+++ b/src/client/opamAdminCommand.ml
@@ -685,7 +685,7 @@ let env_arg =
comma-separated 'var=value' bindings, when resolving variables. \
This is used e.g. when computing available packages: if undefined, \
availability of packages is not taken into account. Note that, \
- unless overriden, variables like 'root' or 'opam-version' may be \
+ unless overridden, variables like 'root' or 'opam-version' may be \
taken from the current opam installation. What is defined in \
$(i,~/.opam/config) is always ignored.")
diff --git a/src/client/opamCommands.ml b/src/client/opamCommands.ml
index 1500a4b..7248fe2 100644
--- a/src/client/opamCommands.ml
+++ b/src/client/opamCommands.ml
@@ -178,13 +178,13 @@ let init =
repository).";
`P "The initial repository and defaults can be set through a \
configuration file found at $(i,~/.opamrc) or $(i,/etc/opamrc).";
- `P "Additionally, this command allows to customise some aspects of opam's \
+ `P "Additionally, this command allows one to customise some aspects of opam's \
shell integration, when run initially (avoiding the interactive \
dialog), but also at any later time.";
`S "ARGUMENTS";
`S "OPTIONS";
`S "CONFIGURATION FILE";
- `P "Any field from the built-in initial configuration can be overriden \
+ `P "Any field from the built-in initial configuration can be overridden \
through $(i,~/.opamrc), $(i,/etc/opamrc), or a file supplied with \
$(i,--config). The default configuration for this version of opam \
can be obtained using $(b,--show-default-opamrc).";
@@ -285,7 +285,7 @@ let init =
let no_sandboxing =
mk_flag ["disable-sandboxing"]
"Use a default configuration with sandboxing disabled (note that this \
- may be overriden by `opamrc' if $(b,--no-opamrc) is not specified or \
+ may be overridden by `opamrc' if $(b,--no-opamrc) is not specified or \
$(b,--config) is used). Use this at your own risk, without sandboxing \
it is possible for a broken package script to delete all your files."
in
@@ -1564,7 +1564,7 @@ let repository =
package definitions anymore. With $(b,--all), makes opam forget about \
these repositories completely.";
"set-repos", `set_repos, ["NAME..."],
- "Explicitely selects the list of repositories to look up package \
+ "Explicitly selects the list of repositories to look up package \
definitions from, in the specified priority order (overriding previous \
selection and ranks), according to the specified scope.";
"set-url", `set_url, ["NAME"; "ADDRESS"; "[QUORUM]"; "[FINGERPRINTS]"],
@@ -1592,7 +1592,7 @@ let repository =
repositories, or all configured repositories with $(b,--all).";
] @ mk_subdoc ~defaults:["","list"] commands @ [
`S scope_section;
- `P "These flags allow to choose what selections are changed by $(b,add), \
+ `P "These flags allow one to choose what selections are changed by $(b,add), \
$(b,remove), $(b,set-repos). If no flag in this section is specified \
the updated selections default to the current switch. Multiple scopes \
can be selected, e.g. $(b,--this-switch --set-default).";
@@ -2326,7 +2326,7 @@ let pin ?(unpin_only=false) () =
used locally.";
`P "If (or $(i,-)) is specified, the package is pinned without a source \
archive. The package name can be omitted if the target is a directory \
- containing one or more valid package definitions (this allows to do \
+ containing one or more valid package definitions (this allows one to do \
e.g. $(i,opam pin add .) from a source directory.";
`P "If $(i,PACKAGE) has the form $(i,name.version), the pinned package \
will be considered as version $(i,version) by opam. Beware that this \
diff --git a/src/client/opamConfigCommand.mli b/src/client/opamConfigCommand.mli
index c77fc00..299949c 100644
--- a/src/client/opamConfigCommand.mli
+++ b/src/client/opamConfigCommand.mli
@@ -24,7 +24,7 @@ val env:
csh:bool -> sexp:bool -> fish:bool -> inplace_path:bool ->
unit
-(** Like [env] but allows to specify the precise env to print rather than
+(** Like [env] but allows one to specify the precise env to print rather than
compute it from a switch state *)
val print_eval_env: csh:bool -> sexp:bool -> fish:bool -> env -> unit
diff --git a/src/client/opamInitDefaults.mli b/src/client/opamInitDefaults.mli
index 06419db..36843f4 100644
--- a/src/client/opamInitDefaults.mli
+++ b/src/client/opamInitDefaults.mli
@@ -9,7 +9,7 @@
(**************************************************************************)
(** This module defines a few defaults, used at 'opam init', that bind opam to
- its default OCaml repository at https://opam.ocaml.org. All can be overriden
+ its default OCaml repository at https://opam.ocaml.org. All can be overridden
through the init command flags or an init config file. *)
open OpamTypes
diff --git a/src/core/opamProcess.ml b/src/core/opamProcess.ml
index 42ff6ad..9475bfd 100644
--- a/src/core/opamProcess.ml
+++ b/src/core/opamProcess.ml
@@ -131,7 +131,7 @@ let string_of_info ?(color=`yellow) info =
[cmd] with arguments [args]. If [stdout_file] or [stderr_file] are
set, the channels are redirected to the corresponding files. The
outputs are discarded is [verbose] is set to false. The current
- environment can also be overriden if [env] is set. The environment
+ environment can also be overridden if [env] is set. The environment
which is used to run the process is recorded into [env_file] (if
set). *)
let create ?info_file ?env_file ?(allow_stdin=true) ?stdout_file ?stderr_file ?env ?(metadata=[]) ?dir
diff --git a/src/format/opamFile.ml b/src/format/opamFile.ml
index 4743c3e..9ca4c34 100644
--- a/src/format/opamFile.ml
+++ b/src/format/opamFile.ml
@@ -2257,7 +2257,7 @@ module OPAMSyntax = struct
(* Post-processing functions used for some fields (optional, because we
don't want them when linting). It's better to do them in the same pass
- as parsing, because it allows to get file positions, which we lose
+ as parsing, because it allows one to get file positions, which we lose
afterwards *)
(* Allow 'flag:xxx' tags as flags, for compat *)
diff --git a/src/format/opamVariable.ml b/src/format/opamVariable.ml
index 832ad00..9cc2fcd 100644
--- a/src/format/opamVariable.ml
+++ b/src/format/opamVariable.ml
@@ -57,7 +57,7 @@ module Full = struct
in
{ scope; variable }
- (* Read the variables overriden through the environment *)
+ (* Read the variables overridden through the environment *)
let read_from_env v =
let var_str = to_string (variable v) in
let undash = OpamStd.String.map (function '-' -> '_' | c -> c) in
diff --git a/src/state/opamGlobalState.mli b/src/state/opamGlobalState.mli
index 4a298d8..3b879e1 100644
--- a/src/state/opamGlobalState.mli
+++ b/src/state/opamGlobalState.mli
@@ -39,7 +39,7 @@ val switch_exists: 'a global_state -> switch -> bool
val installed_versions: 'a global_state -> name -> switch list package_map
(** Default list of repositories to get packages from, ordered by decreasing
- priority. This can be overriden by switch-specific selections, and does not
+ priority. This can be overridden by switch-specific selections, and does not
have to include all configured repositories. *)
val repos_list: 'a global_state -> repository_name list
diff --git a/src/state/opamStateConfig.mli b/src/state/opamStateConfig.mli
index c8d3e98..e6995ad 100644
--- a/src/state/opamStateConfig.mli
+++ b/src/state/opamStateConfig.mli
@@ -50,7 +50,7 @@ include OpamStd.Config.Sig
and type 'a options_fun := 'a options_fun
(** Get the initial opam root value (from default, env or optional argument).
- This allows to get it before doing the init, which is useful to get the
+ This allows one to get it before doing the init, which is useful to get the
configuration file used to fill some options to init() *)
val opamroot: ?root_dir:dirname -> unit -> dirname
diff --git a/src/state/opamStateTypes.mli b/src/state/opamStateTypes.mli
index c00cebc..0e64378 100644
--- a/src/state/opamStateTypes.mli
+++ b/src/state/opamStateTypes.mli
@@ -54,7 +54,7 @@ type +'lock global_state = {
config: OpamFile.Config.t;
(** The main configuration file. A note of caution: this corresponds to the
configuration as loaded from the file: to get the current options, which
- may be overriden through the command-line or environment, see
+ may be overridden through the command-line or environment, see
OpamStateConfig *)
global_variables:
diff --git a/src/state/shellscripts/bwrap.sh b/src/state/shellscripts/bwrap.sh
index 50b833c..6c709ec 100755
--- a/src/state/shellscripts/bwrap.sh
+++ b/src/state/shellscripts/bwrap.sh
@@ -51,7 +51,7 @@ add_sys_mounts() {
done
}
-# remove some unusual pathes (/nix/stored and /rw/usrlocal )
+# remove some unusual paths (/nix/stored and /rw/usrlocal )
# use OPAM_USER_PATH_RO variable to add them
# the OPAM_USER_PATH_RO format is the same as PATH
# ie: export OPAM_USER_PATH_RO=/nix/store:/rw/usrlocal
debian/patches/0002-opamFileTools.lint-Fix-typo-grammar-in-error-message.patch 0 → 100644
View file @ f80c14da
Subject: opamFileTools.lint: Fix typo & grammar in error message
---
src/state/opamFileTools.ml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/state/opamFileTools.ml b/src/state/opamFileTools.ml
index a228dbe..628c5a1 100644
From: Nicolas Braud-Santoni <nicoo@debian.org>
Forwarded: https://github.com/ocaml/opam/pull/3955
Applied-Upstream: no
Last-Update: 2019-08-14
--- a/src/state/opamFileTools.ml
+++ b/src/state/opamFileTools.ml
@@ -670,9 +670,11 @@ let lint ?check_extra_files ?(check_upstream=false) t =
if not_corresponding = [] then None
else
let msg =
- Printf.sprintf "Cheksum%s %s don't verify archive"
- (if List.length chks = 1 then "" else "s")
+ let singular = match chks with _::[] -> true | _ -> false in
+ Printf.sprintf "Checksum%s %s %s match the archive."
+ (if singular then "" else "s")
(OpamStd.List.to_string OpamHash.to_string not_corresponding)
+ (if singular then "doesn't" else "do not")
in
Some msg)
in
debian/patches/0003-opamCommands-Fix-typo-grammar-in-check.patch 0 → 100644
View file @ f80c14da
Subject: opamCommands: Fix typo & grammar in check
---
src/client/opamCommands.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/client/opamCommands.ml b/src/client/opamCommands.ml
index bce4368..ffbbea6 100644
From: Nicolas Braud-Santoni <nicoo@debian.org>
Forwarded: https://github.com/ocaml/opam/pull/3955
Applied-Upstream: no
Last-Update: 2019-08-14
--- a/src/client/opamCommands.ml
+++ b/src/client/opamCommands.ml
@@ -1454,7 +1454,7 @@ let update =
changes, 1 if there were none. Repositories or development packages \
that failed to update are considered without changes. With \
$(b,--upgrade), behaves like $(b,opam upgrade --check), that is, \
- returns 0 only if there are currently availbale updates." in
+ returns 0 only if there currently are available updates." in
let update global_options jobs names repos_only dev_only all check upgrade =
apply_global_options global_options;
OpamStateConfig.update
debian/patches/series
View file @ f80c14da
0002-Add-a-test-target.patch
0002-Fix-spelling-error-in-manpage.patch
0002-opamFileTools.lint-Fix-typo-grammar-in-error-message.patch
0003-opamCommands-Fix-typo-grammar-in-check.patch