From 01137ce722bd892846f22e23d58754e1175af489 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril+git@gmail.com>
Date: Tue, 28 May 2024 17:11:00 +0200
Subject: [PATCH] flake: Add rust-overlay as a separate input

My reasoning is as follows: we need an up-to-date rust-overlay in order
to access recent nightlies. Currently we follow crane's rust-overlay,
but recent versions of crane don't have a rust-overlay input anymore. So
we'll need to have rust-overlay as input like this eventually anyway.
Hence I did this without even updating crane because there was no need.
---
 flake.lock | 28 ++++++++++++++++++++++++----
 flake.nix  |  6 +++++-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index b5435ed81..836a2c82b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -120,10 +120,7 @@
         "fstar": "fstar",
         "hacl-star": "hacl-star",
         "nixpkgs": "nixpkgs",
-        "rust-overlay": [
-          "crane",
-          "rust-overlay"
-        ]
+        "rust-overlay": "rust-overlay_2"
       }
     },
     "rust-overlay": {
@@ -151,6 +148,29 @@
         "type": "github"
       }
     },
+    "rust-overlay_2": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1716862669,
+        "narHash": "sha256-7oTPM9lcdwiI1cpRC313B+lHawocgpY5F07N+Rbm5Uk=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "47b2d15658b37716393b2463a019000dbd6ce4bc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index 4c331088a..522c67996 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,11 @@
         flake-utils.follows = "flake-utils";
       };
     };
-    rust-overlay.follows = "crane/rust-overlay";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     fstar = {
       url = "github:FStarLang/FStar/v2024.01.13";
       inputs = {