Skip to content

ocamlPackages.buildDunePackage: support fixed point args with lib.extendMkDerivation#446007

Merged
vbgl merged 2 commits intoNixOS:masterfrom
stepbrobd:ocaml
Sep 25, 2025
Merged

ocamlPackages.buildDunePackage: support fixed point args with lib.extendMkDerivation#446007
vbgl merged 2 commits intoNixOS:masterfrom
stepbrobd:ocaml

Conversation

@stepbrobd
Copy link
Member

@stepbrobd stepbrobd commented Sep 25, 2025

impl reference #382550 and #390220

btw i don't think there's the need to backport this to 2505 since 2511 will be released soon and i do think this will land before 2511 branch off ;)

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.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. labels Sep 25, 2025
@stepbrobd stepbrobd force-pushed the ocaml branch 2 times, most recently from 9e0c95f to 65e1329 Compare September 25, 2025 11:42
@stepbrobd stepbrobd marked this pull request as ready for review September 25, 2025 11:44
@stepbrobd stepbrobd requested review from momeemt and vbgl September 25, 2025 11:45
@nix-owners nix-owners bot requested a review from ulrikstrid September 25, 2025 11:46
@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. and removed 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. labels Sep 25, 2025
@stepbrobd
Copy link
Member Author

do i need to make the same change to pkgs/build-support/ocaml/oasis.nix and pkgs/build-support/ocaml/topkg.nix here in the same PR or split them up?

findlib
]
++ nativeBuildInputs;
checkPhase =
Copy link
Member Author

Choose a reason for hiding this comment

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

tried defaulting doCheck to true but some pkgs failed to build

might need to set it to false explicitly in those pkgs before defaulting this to true here

@vbgl
Copy link
Contributor

vbgl commented Sep 25, 2025

You can deal with topkg in a different PR. The oasis stuff, imho, should just be removed.

...
}@args:
lib.extendMkDerivation {
constructDrv = stdenv.mkDerivation;
Copy link
Member Author

Choose a reason for hiding this comment

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

i haven't figure out with a way to replicate this behavior (stdenv' = args.stdenv or stdenv;) without adding another argument above lib.extendMkDerivation, but it seems that no in-tree code depends on this...

i personally think it'd be fine leaving this as is

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Sep 25, 2025
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 8.has: documentation This PR adds or changes documentation 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 Sep 25, 2025
@vbgl vbgl added this pull request to the merge queue Sep 25, 2025
Merged via the queue into NixOS:master with commit 69d2b0d Sep 25, 2025
33 of 37 checks passed
@stepbrobd stepbrobd deleted the ocaml branch September 25, 2025 17:23
@stepbrobd stepbrobd mentioned this pull request Nov 7, 2025
13 tasks
Comment on lines +13 to +16
excludeDrvArgNames = [
"minimalOCamlVersion"
"duneVersion"
];
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a reason why these have been excluded? it could be useful to know and access this information.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes. This is meta-data that MUST NOT affect the hash.

Copy link
Contributor

Choose a reason for hiding this comment

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

I see. What about inheriting them in passthru similar to what the python builder does?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants