From f208f8db5fb35da3d593c8479b5224036d09373e Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril+git@gmail.com>
Date: Tue, 19 Nov 2024 13:47:17 +0100
Subject: [PATCH] Deduplicate some more

---
 flake.lock | 27 +++++++--------------------
 flake.nix  |  3 +++
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index ebb1eda..cb935a5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -369,7 +369,9 @@
           "fstar"
         ],
         "hacl-star": "hacl-star",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "rust-by-examples": "rust-by-examples",
         "rust-overlay": "rust-overlay_2"
       },
@@ -485,21 +487,6 @@
       }
     },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1717402443,
-        "narHash": "sha256-KlFiT8xFAVy29iYJU9nBwvkC7WTfUC/jak5jNFz5wHM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c149b8818b982d612f519c7e73449d355206a89a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1732014248,
         "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
@@ -530,7 +517,7 @@
           "karamel"
         ],
         "libcrux": "libcrux",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       }
     },
     "rust-by-examples": {
@@ -578,11 +565,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729736953,
-        "narHash": "sha256-Rb6JUop7NRklg0uzcre+A+Ebrn/ZiQPkm4QdKg6/3pw=",
+        "lastModified": 1731983527,
+        "narHash": "sha256-JECaBgC0pQ91Hq3W4unH6K9to8s2Zl2sPNu7bLOv4ek=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "29b1275740d9283467b8117499ec8cbb35250584",
+        "rev": "71287228d96e9568e1e70c6bbfa3f992d145947b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 291ce46..83bf913 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,12 +8,15 @@
     };
     eurydice = {
       url = "github:aeneasverif/eurydice";
+      # We would need to override karamel's nixpkgs too to get compatible ocaml versions.
+      # inputs.nixpkgs.follows = "nixpkgs";
       inputs.charon.follows = "charon";
     };
     fstar.follows = "eurydice/fstar";
     karamel.follows = "eurydice/karamel";
     hax = {
       url = "github:hacspec/hax";
+      inputs.nixpkgs.follows = "nixpkgs";
       inputs.fstar.follows = "fstar";
     };
     libcrux = {