Skip to content

Commit

Permalink
Use different nixpkgs for rust and ocaml toolchains
Browse files Browse the repository at this point in the history
  • Loading branch information
Nadrieril committed Jan 14, 2025
1 parent 3700520 commit a7f283c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 30 deletions.
31 changes: 9 additions & 22 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
# The inputs we care about are: hax, charon, eurydice, libcrux, bertie. We
# take good care to avoid duplicated inputs to save on evaluation time.
inputs = {
nixpkgs.url = "github:nixos/nixpkgs";
nixpkgs.url = "github:nixos/nixpkgs"; # Recent nixpkgs for rust-overlay
nixpkgs-ocaml.follows = "eurydice/nixpkgs"; # eurydice nixpkgs for ocaml compat
flake-utils.follows = "fstar/flake-utils";
crane.url = "github:ipetkov/crane/da87d1af7e4e09fd0271432340a5cadf3eb96005";
karamel.follows = "eurydice/karamel";
Expand All @@ -13,24 +14,21 @@
};
charon = {
url = "github:aeneasverif/charon";
inputs.nixpkgs.follows = "eurydice/nixpkgs";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-ocaml.follows = "nixpkgs-ocaml";
inputs.flake-utils.follows = "flake-utils";
inputs.rust-overlay.follows = "rust-overlay";
inputs.crane.follows = "crane";
};
aeneas = {
url = "github:aeneasverif/aeneas";
inputs.nixpkgs.follows = "eurydice/nixpkgs";
inputs.nixpkgs.follows = "nixpkgs-ocaml";
inputs.charon.follows = "charon";
inputs.fstar.follows = "fstar";
};
eurydice = {
url = "github:aeneasverif/eurydice";
# If we override this, we would need to override karamel's nixpkgs too to
# get compatible ocaml versions, but flakes don't support nested
# overrides. We also can't use eurydice's nixpkgs everywhere because it
# does not contain `mold-wrapped` which is required by libcrux.
# inputs.nixpkgs.follows = "nixpkgs";
inputs.recent_nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
inputs.charon.follows = "charon";
};
Expand Down

0 comments on commit a7f283c

Please sign in to comment.