Merge branch 'main' of pro.github.com:aeneasverif/eurydice

.github/workflows/nix.yaml

@@ -12,13 +12,21 @@ jobs:
       - name: Build and test
         run: nix flake check -L
 
-  check-charon-pin:
+  charon-pin-is-forward:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # deep clone in order to get access to other commits
-      - run: nix develop '.#ci' --command ./scripts/ci-check-charon-pin.sh
+      - run: nix develop '.#ci' --command ./scripts/ci-check-charon-pin-is-forward.sh
+
+  charon-pin-is-merged:
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # deep clone in order to get access to other commits
+      - run: nix develop '.#ci' --command ./scripts/ci-check-charon-pin-is-merged.sh
 
   kyber:
     needs: [check]
@@ -31,7 +39,10 @@ jobs:
           CHARON_REV="$(nix develop '.#ci' --command jq -r .nodes.charon.locked.rev flake.lock)"
           KRML_REV="$(nix develop '.#ci' --command jq -r .nodes.karamel.locked.rev flake.lock)"
           FSTAR_REV="$(nix develop '.#ci' --command jq -r .nodes.fstar.locked.rev flake.lock)"
-          nix build --refresh -L 'github:cryspen/libcrux#ml-kem' \
+          git clone https://github.com/cryspen/libcrux
+          cd libcrux
+          nix develop --command cargo generate-lockfile
+          nix build --refresh -L '.#ml-kem' \
               --override-input eurydice github:aeneasverif/eurydice/${{ github.sha }} \
               --override-input charon github:aeneasverif/charon/$CHARON_REV \
               --override-input karamel github:FStarLang/karamel/$KRML_REV \
@@ -40,4 +51,5 @@ jobs:
               --override-input eurydice/karamel github:FStarLang/karamel/$KRML_REV \
               --override-input eurydice/fstar github:FStarLang/fstar/$FSTAR_REV \
               --update-input charon/rust-overlay \
+              --update-input hax \
               --update-input crane

flake.nix

@@ -2,7 +2,7 @@
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
     karamel.url = "github:FStarLang/karamel";
-    fstar.url = "github:FStarLang/fstar";
+    fstar.follows = "karamel/fstar";
 
     nixpkgs.follows = "karamel/nixpkgs";