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: 1.9.2 -> 1.10.0 #62256
dune: 1.9.2 -> 1.10.0 #62256
Conversation
cc @Zimmi48 for review |
@GrahamcOfBorg build virt-top |
virt-top does not build because of a broken dependency: camomile |
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.
This breaks virt-top
.
This comment has been minimized.
This comment has been minimized.
This seems to be related to this changelog entries:
FTR camomile is not the only package broken by this change: for instance, sqlexpr is as well. |
One way to move this forward is to introduce a |
FTR these are the packages that are broken by this update:
Depends on ocamlPackages.camomile:
Depends on ocamlPackages.sqlexpr:
Depends on ocamlPackages.lwt_camlp4:
and the following patch is enough to have lwt_camlp4 and its dependencies build: diff --git a/pkgs/development/ocaml-modules/lwt/camlp4.nix b/pkgs/development/ocaml-modules/lwt/camlp4.nix
index 53f0435f462..5367ef3f9f2 100644
--- a/pkgs/development/ocaml-modules/lwt/camlp4.nix
+++ b/pkgs/development/ocaml-modules/lwt/camlp4.nix
@@ -15,6 +15,8 @@ buildDunePackage rec {
propagatedBuildInputs = [ camlp4 ];
+ preBuild = "rm META.lwt_camlp4";
+
meta = {
description = "Camlp4 syntax extension for Lwt (deprecated)";
license = lib.licenses.lgpl21;
@@ -22,4 +24,3 @@ buildDunePackage rec {
maintainers = [ lib.maintainers.vbgl ];
};
} |
The following patch fixes the build for camomile and all the packages that depend on it (including virt-top): diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix
index f21e7643afe..815acf78914 100644
--- a/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/pkgs/development/ocaml-modules/camomile/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, cppo }:
+{ stdenv, fetchurl, fetchFromGitHub, buildDunePackage, cppo }:
buildDunePackage rec {
pname = "camomile";
- version = "1.0.1";
+ version = "git-pr-76";
src = fetchFromGitHub {
owner = "yoriyuki";
repo = pname;
- rev = version;
- sha256 = "1pfxr9kzkpd5bsdqrpxasfxkawwkg4cpx3m1h6203sxi7qv1z3fn";
+ rev = "59e350d7988b90b068d4075512d1ad6002fdea4c";
+ sha256 = "1zlrf2ij70x83rncbsbjw0f4l4sxjylkhhx6ayg2n57zqwhmb999";
};
buildInputs = [ cppo ]; This is basically updating to the version of camomile of yoriyuki/Camomile#76. |
At this point you should ask upstream (camomile) to release a new version. |
They have not even merged the patch. |
Sure. I intended to do so as soon as upstream merges the PR. |
@Mic92 I first tried a solution with |
The last issue is with sqlexpr whose compilation fail like this:
but removing the META file like I did for lwt_camlp4 breaks ppx_sqlexpr:
|
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
From talking to @diml on yoriyuki/Camomile@505202b, it would seem that it could be a Dune bug that we have three packages using jbuilder that do not build with the new version of Dune: |
According to @diml, another fix for this is just to use the |
I've replaced @GrahamcOfBorg build ocamlPackages.camomile ocamlPackages.sqlexpr ocamlPackages.lwt_camlp4 virt-top |
@marsam Have you tried building |
yes, it builds https://gist.github.com/7bdbfff09f0b48d38c5c0f0fd5c1174c @GrahamcOfBorg eval |
@vbgl Isn't this PR ready to be merged? |
Camomile got a fix merged now: yoriyuki/Camomile#76 |
Motivation for this change
Changelog: https://github.com/ocaml/dune/releases/tag/1.10.0
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)