[nixpkgs] 24.05 -> 24.11

2024-12-03 00:14:13 +01:00
parent 4367161e5f
commit f480431a61
1 changed files with 8 additions and 0 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -109,6 +109,7 @@
        "spectrum": "spectrum"
      },
      "locked": {
+<<<<<<< HEAD
 <<<<<<< HEAD
        "lastModified": 1733003272,
        "narHash": "sha256-ratU5qCcRuOojgPWM90gda4qrxukNqbyFi+kan2Ln04=",
@@ -122,6 +123,13 @@
        "repo": "microvm.nix",
        "rev": "e08aed6e3a32e47e21e57bd2791326ea3f7647be",
 >>>>>>> 72ab98e ([nixpkgs] update microvm)
+=======
+        "lastModified": 1733003272,
+        "narHash": "sha256-ratU5qCcRuOojgPWM90gda4qrxukNqbyFi+kan2Ln04=",
+        "owner": "astro",
+        "repo": "microvm.nix",
+        "rev": "e8d5f12b834a59187c7ec147a8952a0567f97939",
+>>>>>>> fa36b06 ([nixpkgs] 24.05 -> 24.11)
        "type": "github"
      },
      "original": {