propagatedBuildInputs for hermes, update carton (#1092)

* propagatedBuildInputs for hermes, update carton * update piaf
nix-ocaml · Sep 28, 2023 · e130a7e · e130a7e
1 parent 70db91c
commit e130a7e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/ocaml/default.nix b/ocaml/default.nix
@@ -407,8 +407,12 @@ with oself;
     buildPhase = "${topkg.buildPhase} --with-cmdliner true";
   });
 
-  carton = disableTests osuper.carton;
-  carton-lwt = disableTests osuper.carton-lwt;
+  carton = osuper.carton.overrideAttrs (_: {
+    src = builtins.fetchurl {
+      url = https://github.com/mirage/ocaml-git/releases/download/carton-v0.7.0/git-carton-v0.7.0.tbz;
+      sha256 = "1y8fybp97csszdzjqpm2bkhv4xklxk619sqc2d198rpqscjh2sdx";
+    };
+  });
 
   caqti = osuper.caqti.overrideAttrs (o: {
     version = "2.0.1";

diff --git a/ocaml/piaf/default.nix b/ocaml/piaf/default.nix
@@ -24,11 +24,10 @@ buildDunePackage {
   src = fetchFromGitHub {
     owner = "anmonteiro";
     repo = "piaf";
-    rev = "9ec58d0f03c2db2e783f81f816a9d7ee2200e623";
-    hash = "sha256-TycNx7j6AfSVd+GEX1hJA5p7jyD/yxl6DxvoRv436x8=";
+    rev = "d9c3c4562bd1633320ca2406051bb37a7a792eba";
+    hash = "sha256-GH3QmugwyWFfd1cDO7Ue7Q+FjPDRNDKGznRlTwjEFoo=";
   };
 
-  doCheck = ocaml.version != "5.0.0" && stdenv.isLinux;
   checkInputs = [ alcotest dune-site ];
 
   propagatedBuildInputs = [

diff --git a/overlay/default.nix b/overlay/default.nix
@@ -222,7 +222,7 @@ in
       "-DHERMES_BUILD_APPLE_FRAMEWORK=false"
     ];
     nativeBuildInputs = with self; [ cmake python3 ninja ];
-    buildInputs = with self; [ icu readline-oc ];
+    propagatedBuildInputs = with self; [ icu readline-oc ];
   };