From 9d9f4e216e6870b7d47ad82e27a8aede682407e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 1 Mar 2023 19:25:55 +0100
Subject: [PATCH] microvm: follow fenix

---
 flake.lock | 43 +++----------------------------------------
 flake.nix  |  3 ++-
 2 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4dbac2b3..e62bea95 100644
--- a/flake.lock
+++ b/flake.lock
@@ -249,28 +249,6 @@
         "type": "github"
       }
     },
-    "fenix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "microvm",
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src_2"
-      },
-      "locked": {
-        "lastModified": 1677219923,
-        "narHash": "sha256-gvNqjERVoc7f9NSBqZCA5RqAX3HjJA+KOhjN0jNaXw0=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "20d2fcd01df0c3db0429112ab3d911ee0bc3a3b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -360,7 +338,9 @@
     },
     "microvm": {
       "inputs": {
-        "fenix": "fenix_2",
+        "fenix": [
+          "fenix"
+        ],
         "flake-utils": [
           "flake-utils"
         ],
@@ -601,23 +581,6 @@
         "type": "github"
       }
     },
-    "rust-analyzer-src_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1676976502,
-        "narHash": "sha256-D0l5hvE4IFUqspKeorawIlLQRMKqCkMAhZ58KjDXJl8=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "27239fbb58a115915ffc1ce65ededc951eb00fd2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
     "rust-overlay": {
       "inputs": {
         "flake-utils": [
diff --git a/flake.nix b/flake.nix
index dac5bfae..f144dd03 100644
--- a/flake.nix
+++ b/flake.nix
@@ -116,8 +116,9 @@
     microvm = {
       url = "github:astro/microvm.nix";
       inputs = {
-        nixpkgs.follows = "nixos";
+        fenix.follows = "fenix";
         flake-utils.follows = "flake-utils";
+        nixpkgs.follows = "nixos";
       };
     };
     naersk = {