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

dune_3: 3.16.1 -> 3.17.0 #361854

Merged
merged 1 commit into from
Dec 16, 2024
Merged

dune_3: 3.16.1 -> 3.17.0 #361854

merged 1 commit into from
Dec 16, 2024

Conversation

smorimoto
Copy link
Contributor

@smorimoto smorimoto commented Dec 4, 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@vbgl
Copy link
Contributor

vbgl commented Dec 4, 2024

@GrahamcOfBorg build ocamlPackages.hxd ocamlPackages.melange ocamlPackages.ocplib-simplex

Copy link
Contributor

@vbgl vbgl left a comment

Choose a reason for hiding this comment

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

This breaks hxd tests (possible workaround: disable them).

@smorimoto
Copy link
Contributor Author

For some reason, the dune cache is enabled, and there seems to be an error that cannot create a directory for it. I don't usually use Nix and don't know how to work around this. Can you help me?

@smorimoto
Copy link
Contributor Author

@vbgl
Copy link
Contributor

vbgl commented Dec 4, 2024

Here is an other suggestion:

--- a/pkgs/development/ocaml-modules/hxd/default.nix
+++ b/pkgs/development/ocaml-modules/hxd/default.nix
@@ -23,6 +23,10 @@ buildDunePackage rec {
 
   doCheck = true;
 
+  preCheck = ''
+    export DUNE_CACHE=disabled
+  '';
+
   meta = with lib; {
     description = "Hexdump in OCaml";
     homepage = "https://github.com/dinosaure/hxd";

@smorimoto
Copy link
Contributor Author

@vbgl Isn't this possible for all packages using dune?

@smorimoto
Copy link
Contributor Author

@GrahamcOfBorg build ocamlPackages.patdiff

@ofborg ofborg bot requested a review from vbgl December 5, 2024 14:48
@nix-owners nix-owners bot requested a review from ulrikstrid December 5, 2024 22:24
@smorimoto
Copy link
Contributor Author

@GrahamcOfBorg build ocamlPackages.hxd

@smorimoto
Copy link
Contributor Author

@GrahamcOfBorg build ocamlPackages.hxd

@smorimoto
Copy link
Contributor Author

@GrahamcOfBorg build ocamlPackages.ligo

@vbgl
Copy link
Contributor

vbgl commented Dec 6, 2024

Other newly failing OCaml libraries: ocplib-simplex, melange.

@smorimoto
Copy link
Contributor Author

@GrahamcOfBorg ocamlPackages.melange

@vbgl
Copy link
Contributor

vbgl commented Dec 6, 2024

ocplib-index can be fixed using the following patch:

diff --git a/tests/dune b/tests/dune
index 4fcdd22..b0e0fff 100644
--- a/tests/dune
+++ b/tests/dune
@@ -11,41 +11,3 @@
    standalone_minimal
    standalone_test_strict_bounds)
  (libraries ocplib-simplex zarith))
-
-(rule
- (alias runtest)
- (action
-  (diff solveEmpty.expected solveEmpty.output)
- )
-)
-
-(rule
- (alias runtest)
- (action
-  (diff
-    standalone_minimal_maximization.expected
-    standalone_minimal_maximization.output
-  )
- )
-)
-
-(rule
- (alias runtest)
- (action
-  (diff
-    standalone_minimal.expected
-    standalone_minimal.output
-  )
- )
-)
-
-(rule
- (alias runtest)
- (action
-  (diff
-    standalone_test_strict_bounds.expected
-    standalone_test_strict_bounds.output
-  )
- )
-)
-

@smorimoto
Copy link
Contributor Author

@vbgl Can you add commits to this PR? I'm completely new to the Nix ecosystem and still don't understand which packages are broken and how.

@vbgl vbgl marked this pull request as draft December 9, 2024 05:56
@vbgl
Copy link
Contributor

vbgl commented Dec 9, 2024

I’ve just done it and included in this branch commits from other PRs (#362572 & #363369).

@smorimoto
Copy link
Contributor Author

Thanks a lot!

Co-authored-by: Vincent Laporte <Vincent.Laporte@gmail.com>
@vbgl vbgl marked this pull request as ready for review December 16, 2024 07:34
@vbgl vbgl added the backport release-24.11 Backport PR automatically label Dec 16, 2024
@smorimoto
Copy link
Contributor Author

Thanks a lot!

@vbgl vbgl merged commit df6fb98 into NixOS:master Dec 16, 2024
27 of 28 checks passed
@nix-backports
Copy link

nix-backports bot commented Dec 16, 2024

Successfully created backport PR for release-24.11:

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

Successfully merging this pull request may close these issues.

2 participants