diff options
| -rw-r--r-- | flake.lock | 42 | ||||
| -rw-r--r-- | flake.nix | 9 |
2 files changed, 14 insertions, 37 deletions
@@ -23,7 +23,10 @@ }, "crane": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": [ + "lanzaboote", + "flake-compat" + ], "flake-utils": [ "lanzaboote", "flake-utils" @@ -89,22 +92,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -339,16 +326,14 @@ "pre-commit-hooks-nix": [ "pre-commit-hooks" ], - "rust-overlay": [ - "rust-overlay" - ] + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1681503721, - "narHash": "sha256-jWmTTUejSCa5qO0D/FJMbgXKdFEllRdvA+jG0KX+MfY=", + "lastModified": 1682286247, + "narHash": "sha256-TdYt/X9FS+oJMWQtGRt/JS/Hhgygigh/VUpL1KlfywY=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "83a357eb7c261c82e2fa6412216b3c4f8f0d1d18", + "rev": "efff933460dbf9e1ea416ece962055b5c8a3d7cd", "type": "github" }, "original": { @@ -571,25 +556,26 @@ "nixpkgsUnstable": "nixpkgsUnstable", "nur": "nur", "openwrt-imagebuilder": "openwrt-imagebuilder", - "pre-commit-hooks": "pre-commit-hooks", - "rust-overlay": "rust-overlay" + "pre-commit-hooks": "pre-commit-hooks" } }, "rust-overlay": { "inputs": { "flake-utils": [ + "lanzaboote", "flake-utils" ], "nixpkgs": [ + "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1681525152, - "narHash": "sha256-KzI+ILcmU03iFWtB+ysPqtNmp8TP8v1BBReTuPP8MJY=", + "lastModified": 1682129965, + "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b6f8d87208336d7cb85003b2e439fc707c38f92a", + "rev": "2c417c0460b788328220120c698630947547ee83", "type": "github" }, "original": { @@ -59,13 +59,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - # TODO: remove when this commit is used in lanzaboote: - # https://github.com/oxalica/rust-overlay/commit/c949d341f2b507857d589c48d1bd719896a2a224 - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; lanzaboote = { url = "github:nix-community/lanzaboote"; inputs.nixpkgs.follows = "nixpkgs"; @@ -73,8 +66,6 @@ inputs.flake-utils.follows = "flake-utils"; inputs.flake-parts.follows = "flake-parts"; inputs.pre-commit-hooks-nix.follows = "pre-commit-hooks"; - # TODO: ditto - inputs.rust-overlay.follows = "rust-overlay"; }; nixinate = { url = "github:MatthewCroughan/nixinate"; |
