[nixpkgs] 24.05 -> 24.11
This commit is contained in:
8
flake.lock
generated
8
flake.lock
generated
@@ -109,6 +109,7 @@
|
|||||||
"spectrum": "spectrum"
|
"spectrum": "spectrum"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
"lastModified": 1733003272,
|
"lastModified": 1733003272,
|
||||||
"narHash": "sha256-ratU5qCcRuOojgPWM90gda4qrxukNqbyFi+kan2Ln04=",
|
"narHash": "sha256-ratU5qCcRuOojgPWM90gda4qrxukNqbyFi+kan2Ln04=",
|
||||||
@@ -122,6 +123,13 @@
|
|||||||
"repo": "microvm.nix",
|
"repo": "microvm.nix",
|
||||||
"rev": "e08aed6e3a32e47e21e57bd2791326ea3f7647be",
|
"rev": "e08aed6e3a32e47e21e57bd2791326ea3f7647be",
|
||||||
>>>>>>> 72ab98e ([nixpkgs] update microvm)
|
>>>>>>> 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"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
Reference in New Issue
Block a user