From fab1fbbf1e3a2c3403de70bfa5ec82a5f8f481b5 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril+git@gmail.com>
Date: Mon, 13 Jan 2025 12:06:42 +0100
Subject: [PATCH] Use recent nixpkgs everywhere

---
 flake.nix | 18 +++++++++---------
 update.sh |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8222be0..f99819b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,34 +5,34 @@
     nixpkgs.url = "github:nixos/nixpkgs";
     flake-utils.follows = "fstar/flake-utils";
     crane.url = "github:ipetkov/crane/da87d1af7e4e09fd0271432340a5cadf3eb96005";
-    karamel.follows = "eurydice/karamel";
-    fstar.follows = "eurydice/karamel/fstar";
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    karamel = {
+      url = "github:FStarLang/karamel";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    fstar.follows = "karamel/fstar";
     charon = {
       url = "github:aeneasverif/charon";
-      inputs.nixpkgs.follows = "eurydice/nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
       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";
       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.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
       inputs.charon.follows = "charon";
+      inputs.karamel.follows = "karamel";
     };
     hax = {
       url = "github:hacspec/hax";
diff --git a/update.sh b/update.sh
index ce02685..ba1d0c7 100755
--- a/update.sh
+++ b/update.sh
@@ -7,8 +7,8 @@ nix flake update \
    --override-input charon "github:aeneasverif/charon" \
    --override-input aeneas "github:aeneasverif/aeneas" \
    --override-input eurydice "github:aeneasverif/eurydice" \
-   --override-input eurydice/karamel "github:FStarLang/karamel" \
-   --override-input eurydice/karamel/fstar "github:FStarLang/fstar" \
+   --override-input karamel "github:FStarLang/karamel" \
+   --override-input karamel/fstar "github:FStarLang/fstar" \
    --override-input libcrux "github:cryspen/libcrux" \
    --override-input bertie "github:cryspen/bertie"