diff options
| -rw-r--r-- | flake.lock | 109 | ||||
| -rw-r--r-- | flake.nix | 20 |
2 files changed, 41 insertions, 88 deletions
@@ -58,58 +58,24 @@ "crane": { "inputs": { "flake-compat": [ - "lanzaboote", "flake-compat" ], "flake-utils": [ - "lanzaboote", "flake-utils" ], "nixpkgs": [ - "lanzaboote", "nixpkgs" ], "rust-overlay": [ - "lanzaboote", "rust-overlay" ] }, "locked": { - "lastModified": 1688772518, - "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", + "lastModified": 1693787605, + "narHash": "sha256-rwq5U8dy+a9JFny/73L0SJu1GfWwATMPMTp7D+mjHy8=", "owner": "ipetkov", "repo": "crane", - "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": [ - "ragenix", - "flake-utils" - ], - "nixpkgs": [ - "ragenix", - "nixpkgs" - ], - "rust-overlay": [ - "ragenix", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1681680516, - "narHash": "sha256-EB8Adaeg4zgcYDJn9sR6UMjN/OHdIiMMK19+3LmmXQY=", - "owner": "ipetkov", - "repo": "crane", - "rev": "54b63c8eae4c50172cb50b612946ff1d2bc1c75c", + "rev": "8b4f7a4dab2120cf41e7957a28a853f45016bd9d", "type": "github" }, "original": { @@ -180,22 +146,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-utils": { "inputs": { "systems": "systems" @@ -306,7 +256,9 @@ }, "lanzaboote": { "inputs": { - "crane": "crane", + "crane": [ + "crane" + ], "flake-compat": [ "flake-compat" ], @@ -322,7 +274,9 @@ "pre-commit-hooks-nix": [ "pre-commit" ], - "rust-overlay": "rust-overlay" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { "lastModified": 1692972892, @@ -504,14 +458,18 @@ "agenix": [ "agenix" ], - "crane": "crane_2", + "crane": [ + "crane" + ], "flake-utils": [ "flake-utils" ], "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { "lastModified": 1682237245, @@ -531,6 +489,7 @@ "inputs": { "agenix": "agenix", "arkenfox": "arkenfox", + "crane": "crane", "darwin": "darwin", "deploy": "deploy", "flake-compat": "flake-compat", @@ -547,51 +506,25 @@ "openwrt-imagebuilder": "openwrt-imagebuilder", "parts": "parts", "pre-commit": "pre-commit", - "ragenix": "ragenix" + "ragenix": "ragenix", + "rust-overlay": "rust-overlay" } }, "rust-overlay": { "inputs": { "flake-utils": [ - "lanzaboote", - "flake-utils" - ], - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1689906077, - "narHash": "sha256-2tjLXKoSK7O0LYHlA6GCWL0gy2kZZno4krg+KZpDh6U=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "c88b28944129eeff5e819bdc21248dc07eb0625d", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "ragenix", "flake-utils" ], "nixpkgs": [ - "ragenix", "nixpkgs" ] }, "locked": { - "lastModified": 1682129965, - "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=", + "lastModified": 1694052649, + "narHash": "sha256-+eBEU3dw3/fCfi8ZHFNutINxehMazGkQxqNcpeNbTo4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2c417c0460b788328220120c698630947547ee83", + "rev": "a795148ffbcc77f2b592d50ceebe36147e623a77", "type": "github" }, "original": { @@ -30,6 +30,15 @@ inputs.flake-utils.follows = "flake-utils"; }; + # ditto + crane = { + url = "github:ipetkov/crane"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-compat.follows = "flake-compat"; + inputs.flake-utils.follows = "flake-utils"; + inputs.rust-overlay.follows = "rust-overlay"; + }; + deploy = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; @@ -72,10 +81,12 @@ lanzaboote = { url = "github:nix-community/lanzaboote"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.crane.follows = "crane"; inputs.flake-compat.follows = "flake-compat"; inputs.flake-parts.follows = "parts"; inputs.flake-utils.follows = "flake-utils"; inputs.pre-commit-hooks-nix.follows = "pre-commit"; + inputs.rust-overlay.follows = "rust-overlay"; }; nix-index-database = { @@ -109,6 +120,15 @@ url = "github:yaxitech/ragenix"; inputs.nixpkgs.follows = "nixpkgs"; inputs.agenix.follows = "agenix"; + inputs.crane.follows = "crane"; + inputs.flake-utils.follows = "flake-utils"; + inputs.rust-overlay.follows = "rust-overlay"; + }; + + # ditto + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; }; |