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.

Sign up for GitHub

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

Jump to bottom

Opam file generation: Use {dev} instead of {pinned} when calling dune subst #3647

Merged
merged 2 commits into from
Jul 26, 2020
Merged

Opam file generation: Use {dev} instead of {pinned} when calling dune subst #3647

merged 2 commits into from
Jul 26, 2020

Conversation

kit-ty-kate
Copy link
Member

I'm not sure why I hadn't realized that before but the way opam packages are generated currently does not seem quite right.
In particular, if I'm correct dune subst should only be called when users are building a project from its git repository. Currently it is called if someone pins the package but pinned packages can be releases, they are not necessarily in a "dev state".

The opam manual defines {dev} and {pinned} the following ways:

  • {pinned}: whether the package is pinned
  • {dev}: true if this is a development package, i.e. it was not built from a release archive

See https://github.com/ocaml/opam/blob/2.0/src/state/opamSwitchState.ml#L393 for the implementation details

rgrinberg
rgrinberg reviewed Jul 23, 2020
View reviewed changes
src/dune/opam_create.ml Outdated Show resolved Hide resolved
kit-ty-kate and others added 2 commits July 25, 2020 19:47
@kit-ty-kate @rgrinberg
Opam file generation: Use {dev} instead of {pinned} when calling dune…
ea75c93 
… subst

Signed-off-by: Kate <kit.ty.kate@disroot.org>
@rgrinberg
Switch from pinned to dev in dune's own packages
36d75ce 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg
Copy link
Member

Thanks. I've updated dune's own opam file to reflect this.

@rgrinberg rgrinberg merged commit e161637 into ocaml:master Jul 26, 2020
@kit-ty-kate kit-ty-kate mentioned this pull request Jul 30, 2020
Merged
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Aug 14, 2020
@rgrinberg
[new release] dune-build-info, dune, dune-configurator, dune-action-p…
545d8e0 
…lugin, dune-private-libs and dune-glob (2.7.0)

CHANGES:

- Write intermediate files in a `.mdx` folder for each `mdx` stanza
  to prevent the corresponding actions to be executed as part of the `@all`
  alias (ocaml/dune#3659, @NathanReb)

- Read Coq flags from `env` (ocaml/dune#3547 , fixes ocaml/dune#3486, @gares)

- Allow bisect_ppx to be enabled/disabled via dune-workspace. (ocaml/dune#3404,
  @stephanieyou)

- Formatting of dune files is now done in the executing dune process instead of
  in a separate process. (ocaml/dune#3536, @nojb)

- Add a `--debug-artifact-substution` flag to help debug problem with
  version not being captured by `dune-build-info` (ocaml/dune#3589,
  @jeremiedimino)

- Allow the use of the `context_name` variable in the `enabled_if` fields of
  executable(s) and install stanzas. (ocaml/dune#3568, fixes ocaml/dune#3566, @voodoos)

- Fix compatibility with OCaml 4.12.0 when compiling empty archives; no .a file
  is generated. (ocaml/dune#3576, @dra27)

- `$ dune utop` no longer tries to load optional libraries that are unavailable
  (ocaml/dune#3612, fixes ocaml/dune#3188, @anuragsoni)

- Fix dune-build-info on 4.10.0+flambda (ocaml/dune#3599, @emillon, @jeremiedimino).

- Allow multiple libraries with `inline_tests` to be defined in the same
  directory (ocaml/dune#3621, @rgrinberg)

- Run exit hooks in jsoo separate compilation mode (ocaml/dune#3626, fixes ocaml/dune#3622,
  @rgrinberg)

- Add (alias ...), (mode ...) fields to (copy_fields ...) stanza (ocaml/dune#3631, @nojb)

- (copy_files ...) now supports copying files from outside the workspace using
  absolute file names (ocaml/dune#3639, @nojb)

- Dune does not use `ocamlc` as an intermediary to call C compiler anymore.
  Configuration flags `ocamlc_cflags` and `ocamlc_cppflags` are always prepended
  to the compiler arguments. (ocaml/dune#3565, fixes ocaml/dune#3346, @voodoos)

- Revert the build optimization in ocaml/dune#2268. This optimization slows down building
  individual executables when they're part of an `executables` stanza group
  (ocaml/dune#3644, @rgrinberg)

- Use `{dev}` rather than `{pinned}` in the generated `.opam` file. (ocaml/dune#3647,
  @kit-ty-kate)

- Insert correct extension name when editing `dune-project` files. Previously,
  dune would just insert the stanza name. (ocaml/dune#3649, fixes ocaml/dune#3624, @rgrinberg)

- Fix crash when evaluating an `mdx` stanza that depends on unavailable
  packages. (ocaml/dune#3650, @craigfe)

- Fix typo in `cache-check-probablity` field in dune config files. This field
  now requires 2.7 as it wasn't usable before this version. (ocaml/dune#3652, @edwintorok)

- Add `"odoc" {with-doc}` to the dependencies in the generated `.opam` files.
  (ocaml/dune#3667, @kit-ty-kate)

- Do not allow user actions to capture dune's stdin (ocaml/dune#3677, fixes ocaml/dune#3672,
  @rgrinberg)

- `(subdir ...)` stanzas can now appear in dune files used via `(include ...)`.
  (ocaml/dune#3676, @nojb)
@rgrinberg rgrinberg mentioned this pull request Aug 14, 2020
Merged
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Aug 14, 2020
@rgrinberg
[new release] dune-build-info, dune, dune-configurator, dune-action-p…
fd24ec4 
…lugin, dune-private-libs and dune-glob (2.7.0)

CHANGES:

- Write intermediate files in a `.mdx` folder for each `mdx` stanza
  to prevent the corresponding actions to be executed as part of the `@all`
  alias (ocaml/dune#3659, @NathanReb)

- Read Coq flags from `env` (ocaml/dune#3547 , fixes ocaml/dune#3486, @gares)

- Add instrumentation framework to toggle instrumentation by `bisect_ppx`,
  `landmarks`, etc, via dune-workspace and/or the command-line. (ocaml/dune#3404, ocaml/dune#3526
  @stephanieyou, @nojb)

- Formatting of dune files is now done in the executing dune process instead of
  in a separate process. (ocaml/dune#3536, @nojb)

- Add a `--debug-artifact-substution` flag to help debug problem with
  version not being captured by `dune-build-info` (ocaml/dune#3589,
  @jeremiedimino)

- Allow the use of the `context_name` variable in the `enabled_if` fields of
  executable(s) and install stanzas. (ocaml/dune#3568, fixes ocaml/dune#3566, @voodoos)

- Fix compatibility with OCaml 4.12.0 when compiling empty archives; no .a file
  is generated. (ocaml/dune#3576, @dra27)

- `$ dune utop` no longer tries to load optional libraries that are unavailable
  (ocaml/dune#3612, fixes ocaml/dune#3188, @anuragsoni)

- Fix dune-build-info on 4.10.0+flambda (ocaml/dune#3599, @emillon, @jeremiedimino).

- Allow multiple libraries with `inline_tests` to be defined in the same
  directory (ocaml/dune#3621, @rgrinberg)

- Run exit hooks in jsoo separate compilation mode (ocaml/dune#3626, fixes ocaml/dune#3622,
  @rgrinberg)

- Add (alias ...), (mode ...) fields to (copy_fields ...) stanza (ocaml/dune#3631, @nojb)

- (copy_files ...) now supports copying files from outside the workspace using
  absolute file names (ocaml/dune#3639, @nojb)

- Dune does not use `ocamlc` as an intermediary to call C compiler anymore.
  Configuration flags `ocamlc_cflags` and `ocamlc_cppflags` are always prepended
  to the compiler arguments. (ocaml/dune#3565, fixes ocaml/dune#3346, @voodoos)

- Revert the build optimization in ocaml/dune#2268. This optimization slows down building
  individual executables when they're part of an `executables` stanza group
  (ocaml/dune#3644, @rgrinberg)

- Use `{dev}` rather than `{pinned}` in the generated `.opam` file. (ocaml/dune#3647,
  @kit-ty-kate)

- Insert correct extension name when editing `dune-project` files. Previously,
  dune would just insert the stanza name. (ocaml/dune#3649, fixes ocaml/dune#3624, @rgrinberg)

- Fix crash when evaluating an `mdx` stanza that depends on unavailable
  packages. (ocaml/dune#3650, @craigfe)

- Fix typo in `cache-check-probablity` field in dune config files. This field
  now requires 2.7 as it wasn't usable before this version. (ocaml/dune#3652, @edwintorok)

- Add `"odoc" {with-doc}` to the dependencies in the generated `.opam` files.
  (ocaml/dune#3667, @kit-ty-kate)

- Do not allow user actions to capture dune's stdin (ocaml/dune#3677, fixes ocaml/dune#3672,
  @rgrinberg)

- `(subdir ...)` stanzas can now appear in dune files used via `(include ...)`.
  (ocaml/dune#3676, @nojb)
@kit-ty-kate kit-ty-kate mentioned this pull request Sep 28, 2020
Merged
This was referenced Apr 14, 2021
Merged
Merged
rgrinberg pushed a commit that referenced this pull request Apr 16, 2021
@mseri @rgrinberg
opam.rst: dune subst should be called with dev
b456daf 
See also #3647

Signed-off-by: Marcello Seri <marcello.seri@gmail.com>
kit-ty-kate added a commit to kit-ty-kate/mkocaml that referenced this pull request May 14, 2021
@kit-ty-kate
Fix opam file generation
d3a427a 
See ocaml/dune#3647 for details
This was referenced May 14, 2021
Merged
Merged
This was referenced May 24, 2021
Merged
Merged
@kit-ty-kate kit-ty-kate mentioned this pull request Jul 24, 2021
Merged
@kit-ty-kate kit-ty-kate mentioned this pull request Aug 4, 2021
Merged
@kit-ty-kate kit-ty-kate mentioned this pull request Sep 5, 2021
Merged
@kit-ty-kate kit-ty-kate mentioned this pull request Nov 3, 2021
Merged
kit-ty-kate added a commit to Chris00/opam-repository that referenced this pull request Nov 4, 2021
@kit-ty-kate
crlibm.0.5: dune subst pinned --> dev (see ocaml/dune#3647)
57f7acd
@kit-ty-kate kit-ty-kate mentioned this pull request Nov 5, 2021
Merged
kit-ty-kate added a commit to ygrek/opam-repository that referenced this pull request Nov 25, 2021
@kit-ty-kate
zstd.0.3: dune subst pinned --> dev (see ocaml/dune#3647)
2c8042f
kit-ty-kate added a commit to c-cube/opam-repository that referenced this pull request Dec 12, 2021
@kit-ty-kate
avro-compiler.0.1: dune subst pinned --> dev (see ocaml/dune#3647)
a78650f
kit-ty-kate added a commit to c-cube/opam-repository that referenced this pull request Dec 12, 2021
@kit-ty-kate
avro.0.1: dune subst pinned --> dev (see ocaml/dune#3647)
8b98ca6
kit-ty-kate added a commit to sanette/opam-repository that referenced this pull request Jan 10, 2022
@kit-ty-kate
ubase.0.05: dune subst pinned --> dev (see ocaml/dune#3647)
93571f5
@kit-ty-kate kit-ty-kate mentioned this pull request Jan 15, 2022
Merged
favonia added a commit to RedPRL/yuujinchou that referenced this pull request Feb 27, 2022
@favonia
build(dune): use dev for dune subst; ocaml/dune#3647
e3097c2
@kit-ty-kate kit-ty-kate mentioned this pull request Jul 4, 2022
Merged
@kit-ty-kate kit-ty-kate mentioned this pull request Jul 11, 2022
Merged
kit-ty-kate added a commit to kit-ty-kate/ocaml-ssl that referenced this pull request Jul 20, 2022
@kit-ty-kate
Fix calls to dune subst
c2cad61 
See ocaml/dune#3647
@kit-ty-kate kit-ty-kate mentioned this pull request Jul 20, 2022
Merged
anmonteiro pushed a commit to savonet/ocaml-ssl that referenced this pull request Jul 20, 2022
@kit-ty-kate
Fix calls to dune subst (#85)
c8d297a 
See ocaml/dune#3647
@kit-ty-kate kit-ty-kate mentioned this pull request Nov 9, 2022
Open
@haochenx haochenx mentioned this pull request Oct 5, 2023
Merged
@Halbaroth Halbaroth mentioned this pull request Mar 28, 2024
Merged
Halbaroth added a commit to Halbaroth/ocplib-simplex that referenced this pull request Mar 28, 2024
@Halbaroth
Bump the minimal version of Dune to 3.0
8e489ac 
The generated opam files by `Dune < 3.0` isn't correct when
calling `dune subst`. See issue ocaml/dune#3647.

This commit bumps the minimal version to `3.0`.
@Halbaroth Halbaroth mentioned this pull request Mar 28, 2024
Merged
@shonfeder shonfeder mentioned this pull request Sep 25, 2024
Merged
shonfeder added a commit to shonfeder/datalog that referenced this pull request Oct 17, 2024
@shonfeder
Update to dune 2.7
6bc4a87 
This will ensure the the generated opam file doesn't have the erroneous
config noted in ocaml/dune#3647
@shonfeder shonfeder mentioned this pull request Oct 17, 2024
Merged
c-cube pushed a commit to c-cube/datalog that referenced this pull request Oct 17, 2024
@shonfeder @c-cube
Update to dune 2.7
6d5e100 
This will ensure the the generated opam file doesn't have the erroneous
config noted in ocaml/dune#3647
@shonfeder shonfeder mentioned this pull request Oct 29, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rgrinberg rgrinberg rgrinberg left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kit-ty-kate @rgrinberg