Skip to content

ocamlPackages.findlib: detect conflicts of version early#205646

Merged
symphorien merged 1 commit into
NixOS:masterfrom
symphorien:ocamlconflict
Jan 27, 2023
Merged

ocamlPackages.findlib: detect conflicts of version early#205646
symphorien merged 1 commit into
NixOS:masterfrom
symphorien:ocamlconflict

Conversation

@symphorien
Copy link
Copy Markdown
Member

@symphorien symphorien commented Dec 11, 2022 •
edited
Loading

just like pythonCatchConflictHook

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions Bot added 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. 8.has: documentation This PR adds or changes documentation labels Dec 11, 2022
@ofborg ofborg Bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Dec 11, 2022
@symphorien symphorien requested a review from vbgl December 11, 2022 16:58
Mindavi
Mindavi approved these changes Dec 25, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@Mindavi Mindavi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On first impression this LGTM, but I don't know anything about ocaml :)

ulrikstrid
ulrikstrid approved these changes Jan 4, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@ulrikstrid ulrikstrid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks reasonable and very useful!

@SuperSandro2000 SuperSandro2000 added the 12.approvals: 2 This PR was reviewed and approved by two persons. label Jan 23, 2023
@SuperSandro2000
Copy link
Copy Markdown
Member

SuperSandro2000 commented Jan 24, 2023

Can someone run a nixpkgs-review to see if we already have regressions?

@ulrikstrid
Copy link
Copy Markdown
Member

ulrikstrid commented Jan 24, 2023

Can someone run a nixpkgs-review to see if we already have regressions?

@SuperSandro2000

2 packages failed to build:
alt-ergo glsurf

189 packages built:
abella acgtk anders beluga coccinelle comby compcert coq coqPackages.Cheerios coqPackages.CoLoR coqPackages.HoTT coqPackages.ITree coqPackages.InfSeqExt coqPackages.LibHyps coqPackages.QuickChick coqPackages.StructTact coqPackages.VST coqPackages.Verdi coqPackages.aac-tactics coqPackages.addition-chains coqPackages.autosubst coqPackages.bignums coqPackages.category-theory coqPackages.ceres coqPackages.coq-bits coqPackages.coq-elpi coqPackages.coq-ext-lib coqPackages.coq-record-update coqPackages.coqeal coqPackages.coqide coqPackages.coqprime coqPackages.coquelicot coqPackages.corn coqPackages.deriving coqPackages.dpdgraph coqPackages.equations coqPackages.extructures coqPackages.flocq coqPackages.fourcolor coqPackages.gaia coqPackages.gaia-hydras coqPackages.gappalib coqPackages.goedel coqPackages.graph-theory coqPackages.hierarchy-builder coqPackages.hydra-battles coqPackages.interval coqPackages.iris coqPackages.itauto coqPackages.math-classes coqPackages.mathcomp coqPackages.mathcomp-abel coqPackages.mathcomp-algebra coqPackages.mathcomp-algebra-tactics coqPackages.mathcomp-analysis coqPackages.mathcomp-bigenough coqPackages.mathcomp-character coqPackages.mathcomp-classical coqPackages.mathcomp-field coqPackages.mathcomp-fingroup coqPackages.mathcomp-finmap coqPackages.mathcomp-real-closed coqPackages.mathcomp-solvable coqPackages.ssreflect coqPackages.mathcomp-tarjan coqPackages.mathcomp-word coqPackages.mathcomp-zify coqPackages.metacoq coqPackages.metacoq-erasure coqPackages.metacoq-pcuic coqPackages.metacoq-safechecker coqPackages.metacoq-template-coq coqPackages.metalib coqPackages.multinomials coqPackages.odd-order coqPackages.paco coqPackages.paramcoq coqPackages.parsec coqPackages.pocklington coqPackages.reglang coqPackages.relation-algebra coqPackages.semantics coqPackages.serapi coqPackages.simple-io coqPackages.stdpp coqPackages.tlc coqPackages.topology coqPackages.trakt coqPackages.zorns-lemma coq_8_10 coq_8_11 coq_8_12 coq_8_13 coq_8_14 coq_8_15 coq_8_5 coq_8_6 coq_8_7 coq_8_8 coq_8_9 csvtool cubicle cvehound diffoscope dot-merlin-reader dune-release dune_1 dune_2 dune_3 easycrypt eff flitter flow framac fstar google-drive-ocamlfuse guestfs-tools haxe haxePackages.format haxePackages.heaps haxePackages.hlopenal haxePackages.hlsdl hxcpp haxePackages.hxcs haxePackages.hxjava haxePackages.hxnodejs_4 haxe_3_2 haxe_3_4 haxe_4_0 haxe_4_1 heptagon hevea hol_light ikos jackline jasmin-compiler leo2 libbap libguestfs ligo liquidsoap mldonkey monotoneViz obelisk obliv-c ocaml-crunch ocaml-top ocamlformat ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 ocamlformat_0_22_4 ocamlformat_0_23_0 ocsigen-i18n opa opaline opam-installer opam2json orpie ott patdiff prooftree proverif python310Packages.bap python310Packages.guestfs python39Packages.bap python39Packages.guestfs reason rml satallax satysfi sawjap sgx-psw sgx-sdk sgx-ssl sks soupault spark2014 stog unison usync vagrant virt-top vscode-extensions.chenglou92.rescript-vscode wasm wayland-proxy-virtwl why3 wyrd

@SuperSandro2000
Copy link
Copy Markdown
Member

SuperSandro2000 commented Jan 24, 2023

alt-ergo glsurf is broken already on master.

@wegank
Copy link
Copy Markdown
Member

wegank commented Jan 26, 2023 •
edited
Loading

@ofborg build coqPackages.category-theory

@symphorien symphorien merged commit b55a8d3 into NixOS:master Jan 27, 2023
@ulrikstrid ulrikstrid mentioned this pull request Jan 30, 2023
Closed
13 tasks
@vbgl vbgl mentioned this pull request Feb 1, 2023
Closed
@vbgl
Copy link
Copy Markdown
Contributor

vbgl commented Feb 1, 2023

This broke coqPackages_8_14.compcert.

@wegank
Copy link
Copy Markdown
Member

wegank commented Feb 1, 2023

So dontDetectOcamlConflicts = false temporarily?

@vbgl
Copy link
Copy Markdown
Contributor

vbgl commented Feb 1, 2023

Good to know there is a quick workaround. I hope we can come up with a proper fix (e.g., drop findlib from the build inputs).

@symphorien symphorien mentioned this pull request Feb 2, 2023
Merged
13 tasks
symphorien added a commit that referenced this pull request Feb 18, 2023
@symphorien
ocamlPackages.findlib: explain how to bypass the dep conflict detection
72e0ac1 
Inspired by #205646 (comment)
anmonteiro added a commit to anmonteiro/dune that referenced this pull request Mar 11, 2023
@anmonteiro
fix(nix): fix duplicate packages warning
7e8e5de 
after NixOS/nixpkgs#205646, Nix detects
conflicting findlib libraries in the `$OCAMLPATH`. Because we use 2
nixpkgs sources, patdiff was running into that case

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
@anmonteiro anmonteiro mentioned this pull request Mar 11, 2023
Merged
anmonteiro added a commit to anmonteiro/dune that referenced this pull request Mar 11, 2023
@anmonteiro
fix(nix): fix duplicate packages warning
5d8db1e 
after NixOS/nixpkgs#205646, Nix detects
conflicting findlib libraries in the `$OCAMLPATH`. Because we use 2
nixpkgs sources, patdiff was running into that case

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
@Alizter
Copy link
Copy Markdown
Contributor

Alizter commented Mar 11, 2023

We also had problems with this in the Dune flake and had to ignore detection for now.

Alizter pushed a commit to ocaml/dune that referenced this pull request Mar 11, 2023
@anmonteiro @Alizter
fix(nix): fix duplicate packages warning
67d714e 
after NixOS/nixpkgs#205646, Nix detects
conflicting findlib libraries in the `$OCAMLPATH`. Because we use 2
nixpkgs sources, patdiff was running into that case

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
@ulrikstrid
Copy link
Copy Markdown
Member

ulrikstrid commented Mar 12, 2023

@Alizter does #213577 fix it? Or what is the issue you are seeing?

@Alizter
Copy link
Copy Markdown
Contributor

Alizter commented Mar 12, 2023

@ulrikstrid We fixed it by tweaking our packages slightly in the end. I guess it just made us more aware of conflicts from before.

@anmonteiro anmonteiro mentioned this pull request Mar 15, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ulrikstrid ulrikstrid ulrikstrid approved these changes

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@Mindavi Mindavi Mindavi approved these changes

@vbgl vbgl Awaiting requested review from vbgl

@marsam marsam Awaiting requested review from marsam

@sternenseemann sternenseemann Awaiting requested review from sternenseemann

Assignees

No one assigned

Labels

6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. 8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@symphorien @SuperSandro2000 @ulrikstrid @wegank @vbgl @Alizter @Mindavi