Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use different nixpkgs for rust and ocaml toolchains #12

Merged
merged 2 commits into from
Jan 14, 2025
Merged

Use different nixpkgs for rust and ocaml toolchains #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3700520
Update charon
Nadrieril Jan 13, 2025
a7f283c
Use different nixpkgs for rust and ocaml toolchains
Nadrieril Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 14 additions & 39 deletions flake.lock
View file
Open in desktop

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
View file
Open in desktop
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