Use recent nixpkgs for the non-ocaml side of charon

AeneasVerif · Jan 13, 2025 · 34df0d2 · 34df0d2
1 parent 615d3cb
commit 34df0d2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -9,7 +9,8 @@
     recent_nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
 
     charon.url = "github:AeneasVerif/charon";
-    charon.inputs.nixpkgs.follows = "nixpkgs";
+    charon.inputs.nixpkgs.follows = "recent_nixpkgs";
+    charon.inputs.nixpkgs-ocaml.follows = "nixpkgs";
   };
   outputs =
     { self

diff --git a/scripts/update-charon-pin.sh b/scripts/update-charon-pin.sh
@@ -9,3 +9,4 @@ CHARON_BRANCH="$(git -C "$CHARON_DIR" rev-parse --abbrev-ref HEAD)"
 CHARON_COMMIT="$(git -C "$CHARON_DIR" rev-parse HEAD)"
 echo 'Taking the commit from your local charon directory. The charon branch is `'"$CHARON_BRANCH"'`'
 nix flake lock --extra-experimental-features nix-command --extra-experimental-features flakes --override-input charon "github:aeneasverif/charon/$CHARON_COMMIT"
+nix flake lock --extra-experimental-features nix-command --extra-experimental-features flakes --update-input charon/rust-overlay