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.

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

ocamlPackages.memprof-limits: init at 0.2.1 #318800

Merged
merged 4 commits into from
Jun 11, 2024
Merged

Conversation

Alizter
Copy link
Contributor

@Alizter Alizter commented Jun 10, 2024

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@Alizter Alizter requested a review from ulrikstrid as a code owner June 10, 2024 13:42
@Alizter Alizter mentioned this pull request Jun 10, 2024
13 tasks
@vbgl
Copy link
Contributor

vbgl commented Jun 10, 2024

This does not build with OCaml 5.2. It might be nice to throw an evaluation-time error.

@Alizter
Copy link
Contributor Author

Alizter commented Jun 10, 2024

Yes, it seems we need to restrict < 5.0.

@Alizter
Copy link
Contributor Author

Alizter commented Jun 10, 2024

@vbgl I've added a check. Do you think it would be better if we introduced maximalOCamlVersion in buildDunePackage?

@vbgl
Copy link
Contributor

vbgl commented Jun 10, 2024

Do you think it would be better if we introduced maximalOCamlVersion in buildDunePackage?

It sounds like a good idea. In particular, this would help avoiding silly mistakes such as swapping the arguments to versionAtLeast.

@ofborg ofborg 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 Jun 10, 2024
@@ -8,7 +8,8 @@ let Dune =
; in

if (args ? minimumOCamlVersion && lib.versionOlder ocaml.version args.minimumOCamlVersion) ||
(args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion)
(args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.minimalOCamlVersion) ||
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is it correct that our minimal ocaml version bound is strict?

@vbgl
Copy link
Contributor

vbgl commented Jun 10, 2024

Please leave the refactoring of buildDunePackage as a separate PR.

@Alizter
Copy link
Contributor Author

Alizter commented Jun 10, 2024

@vbgl OK, I'll put that in a separate PR then.

@vbgl
Copy link
Contributor

vbgl commented Jun 10, 2024

While you’re at it, please double-check what happens to minimalOCamlVersion and the like (i.e., arguments that are intended for dune wrapper and not for the underlying mkDerivation).

@Alizter
Copy link
Contributor Author

Alizter commented Jun 10, 2024

I've dropped the commit touching buildDunePackage (I'll handle that in another PR) and updated the version check. I am using versionOlder and the arguments should be in the correct order this time.

@vbgl vbgl merged commit 15427ed into NixOS:master Jun 11, 2024
16 of 18 checks passed
@Alizter Alizter deleted the memprof-limits branch June 11, 2024 11:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: ocaml 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants