Skip to content

dune, opaline: remove top-level inherit, modernize#485689

Merged
vbgl merged 2 commits intoNixOS:stagingfrom
qweered:opaline-move-overrides
Feb 10, 2026
Merged

dune, opaline: remove top-level inherit, modernize#485689
vbgl merged 2 commits intoNixOS:stagingfrom
qweered:opaline-move-overrides

Conversation

@qweered
Copy link
Contributor

@qweered qweered commented Jan 31, 2026 •
edited
Loading

This is a step towards #454525, which will help enable checking for additional by-name directories (e.g. Python) in nixpkgs-vet.

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

@qweered qweered requested a review from mdaniels5757 January 31, 2026 19:00
@nixpkgs-ci nixpkgs-ci bot requested a review from vbgl January 31, 2026 19:03
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jan 31, 2026
@qweered qweered mentioned this pull request Jan 31, 2026
Open
46 tasks
@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Feb 2, 2026
vbgl
vbgl requested changes Feb 2, 2026
View reviewed changes
@qweered qweered force-pushed the opaline-move-overrides branch 2 times, most recently from f140dd2 to 9bfc7f1 Compare February 2, 2026 13:12
github-actions[bot]

This comment was marked as outdated.

Sign in to view

@qweered qweered force-pushed the opaline-move-overrides branch 2 times, most recently from 17e51b2 to d91b0ac Compare February 2, 2026 13:20
@qweered qweered changed the base branch from master to staging February 2, 2026 13:22
@nixpkgs-ci nixpkgs-ci bot closed this Feb 2, 2026
@nixpkgs-ci nixpkgs-ci bot reopened this Feb 2, 2026
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Feb 2, 2026
@qweered qweered changed the title opaline: remove top-level inherit, modernize dune, opaline: remove top-level inherit, modernize Feb 2, 2026
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. and removed 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. labels Feb 2, 2026
@gepbird gepbird requested a review from vbgl February 3, 2026 00:34
@gepbird
Copy link
Contributor

gepbird commented Feb 7, 2026

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 485689 --package pkgsStatic.dune --package pkgsStatic.opaline --package opaline --package dune
Commit: cf6fa425778af7e5ea7f8719e59a4d80bd18c034

x86_64-linux

❌ 2 packages failed to build:
  • pkgsStatic.dune
  • pkgsStatic.opaline
✅ 2 packages built:
  • dune
  • opaline

@gepbird
Copy link
Contributor

gepbird commented Feb 7, 2026

I'm not sure about the above report, I can only reproduce it with nixpkgs-review.
Checking out this PR, rebasing onto latest master and building pkgsStatic.opaline works.

@vbgl
Copy link
Contributor

vbgl commented Feb 9, 2026

The failure of pkgsStatic.opaline in the staging branch is related to the switch of OCaml to version 5.4. Thanks for pointing this out. It is unrelated to this PR.

@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 9, 2026
@qweered qweered force-pushed the opaline-move-overrides branch from cf6fa42 to 24c8a1b Compare February 10, 2026 00:23
@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 10, 2026
@qweered qweered force-pushed the opaline-move-overrides branch from 24c8a1b to 495f501 Compare February 10, 2026 00:50
@qweered qweered force-pushed the opaline-move-overrides branch from 495f501 to acbf524 Compare February 10, 2026 00:50
@qweered
Copy link
Contributor Author

qweered commented Feb 10, 2026

fixed build after ocaml bump

@qweered
Copy link
Contributor Author

qweered commented Feb 10, 2026

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 485689 --package opaline --package pkgsStatic.dune_2 --package dune --package pkgsStatic.opaline --package pkgsStatic.dune_3
Commit: acbf524b7a7cc135c431b85b4751cd0f87469352

x86_64-linux

✅ 5 packages built:
  • dune
  • opaline
  • pkgsStatic.dune_2
  • pkgsStatic.dune_3
  • pkgsStatic.opaline

@vbgl vbgl added this pull request to the merge queue Feb 10, 2026
@vbgl
Copy link
Contributor

vbgl commented Feb 10, 2026

Thanks for the fix.

Merged via the queue into NixOS:staging with commit 083e95c Feb 10, 2026
25 checks passed
This was referenced Feb 10, 2026
Draft
Merged
@gepbird gepbird mentioned this pull request Feb 14, 2026
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@gepbird gepbird gepbird approved these changes

@mdaniels5757 mdaniels5757 Awaiting requested review from mdaniels5757

@vbgl vbgl Awaiting requested review from vbgl

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@qweered @gepbird @vbgl