Merge branch 'main' into jonas/kyber-redundancy

cryspen · Jan 14, 2025 · 146086a · 146086a
2 parents 5876a43 + c54a7d6
commit 146086a
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 137 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -14,7 +14,7 @@
       url = "github:aeneasverif/eurydice";
       inputs.charon.follows = "charon";
     };
-    fstar.follows = "eurydice/fstar";
+    fstar.follows = "karamel/fstar";
     karamel.follows = "eurydice/karamel";
     hax.url = "github:hacspec/hax";
   };
@@ -60,14 +60,16 @@
           FSTAR_REV = inputs.fstar.rev;
         };
 
-        craneLib = inputs.crane.mkLib pkgs;
+        rustToolchain = inputs.charon.packages.${system}.rustToolchain;
+        craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rustToolchain;
 
         ml-kem = pkgs.callPackage
           ({ lib
            , clang-tools
            , cmake
            , mold-wrapped
            , ninja
+           , git
            , python3
            , runCommand
            , craneLib
@@ -98,7 +100,9 @@
                 cmake
                 mold-wrapped
                 ninja
+                git
                 python3
+                inputs.fstar.packages.${system}.default
               ] ++ lib.optional checkHax [
                 hax
               ];