ocamlPackages.buildDunePackage: support fixed point args with lib.extendMkDerivation
#446007
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,82 +8,83 @@ | |
| dune_3, | ||
| }: | ||
|
|
||
| lib.extendMkDerivation { | ||
| constructDrv = stdenv.mkDerivation; | ||
| excludeDrvArgNames = [ | ||
| "minimalOCamlVersion" | ||
| "duneVersion" | ||
| ]; | ||
|
Comment on lines
+13
to
+16
Contributor
There was a problem hiding this comment. Is there a reason why these have been excluded? it could be useful to know and access this information.
Contributor
There was a problem hiding this comment. Yes. This is meta-data that MUST NOT affect the hash.
Contributor
There was a problem hiding this comment. I see. What about inheriting them in passthru similar to what the python builder does? |
||
| extendDrvArgs = | ||
| finalAttrs: | ||
| { | ||
| pname, | ||
| version, | ||
| nativeBuildInputs ? [ ], | ||
| enableParallelBuilding ? true, | ||
| ... | ||
| }@args: | ||
|
|
||
| let | ||
| Dune = | ||
| let | ||
| dune-version = args.duneVersion or "3"; | ||
| in | ||
| { | ||
| "1" = dune_1; | ||
| "2" = dune_2; | ||
| "3" = dune_3; | ||
| } | ||
| ."${dune-version}"; | ||
| in | ||
|
|
||
| if args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion then | ||
| throw "${pname}-${version} is not available for OCaml ${ocaml.version}" | ||
| else | ||
| { | ||
| name = "ocaml${ocaml.version}-${pname}-${version}"; | ||
|
|
||
| strictDeps = true; | ||
|
|
||
| inherit enableParallelBuilding; | ||
| dontAddStaticConfigureFlags = true; | ||
| configurePlatforms = [ ]; | ||
|
|
||
| nativeBuildInputs = [ | ||
| ocaml | ||
| Dune | ||
| findlib | ||
| ] | ||
| ++ nativeBuildInputs; | ||
|
|
||
| buildPhase = | ||
| args.buildPhase or '' | ||
| runHook preBuild | ||
| dune build -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} | ||
| runHook postBuild | ||
| ''; | ||
|
|
||
| installPhase = | ||
| args.installPhase or '' | ||
| runHook preInstall | ||
| dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} \ | ||
| ${ | ||
| if lib.versionAtLeast Dune.version "2.9" then | ||
| "--docdir $out/share/doc --mandir $out/share/man" | ||
| else | ||
| "" | ||
| } | ||
| runHook postInstall | ||
| ''; | ||
|
|
||
| checkPhase = | ||
|
Member
Author
There was a problem hiding this comment. tried defaulting might need to set it to false explicitly in those pkgs before defaulting this to true here |
||
| args.checkPhase or '' | ||
| runHook preCheck | ||
| dune runtest -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} | ||
| runHook postCheck | ||
| ''; | ||
|
|
||
| meta = (args.meta or { }) // { | ||
| platforms = args.meta.platforms or ocaml.meta.platforms; | ||
| }; | ||
| }; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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 abovelib.extendMkDerivation, but it seems that no in-tree code depends on this...i personally think it'd be fine leaving this as is