summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseth <[email protected]>2024-10-21 01:51:50 -0400
committerseth <[email protected]>2024-10-21 01:51:50 -0400
commitc0a2e3afb89420da4324d4b5fe2b9d3b2a1a1388 (patch)
tree99c44866a374414731205882b9653bfa25c7f6d2
parent5a30b980d6a872616dfb98ec8fb0e32a6b0f6fbb (diff)
flake: dedup terranix inputs
-rw-r--r--flake.lock55
-rw-r--r--flake.nix3
2 files changed, 11 insertions, 47 deletions
diff --git a/flake.lock b/flake.lock
index 3f2e7d9..6001a47 100644
--- a/flake.lock
+++ b/flake.lock
@@ -130,23 +130,6 @@
"type": "github"
}
},
- "flake-parts_2": {
- "inputs": {
- "nixpkgs-lib": "nixpkgs-lib"
- },
- "locked": {
- "lastModified": 1727826117,
- "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
- "type": "github"
- },
- "original": {
- "id": "flake-parts",
- "type": "indirect"
- }
- },
"flake-utils": {
"inputs": {
"systems": "systems"
@@ -364,18 +347,6 @@
"type": "github"
}
},
- "nixpkgs-lib": {
- "locked": {
- "lastModified": 1727825735,
- "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
- "type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
- },
- "original": {
- "type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
- }
- },
"nixpkgs-stable": {
"locked": {
"lastModified": 1729181673,
@@ -492,21 +463,6 @@
"type": "github"
}
},
- "systems_2": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
"teawiebot": {
"inputs": {
"nixpkgs": [
@@ -532,11 +488,18 @@
"inputs": {
"bats-assert": [],
"bats-support": [],
- "flake-parts": "flake-parts_2",
+ "flake-parts": [
+ "lanzaboote",
+ "flake-parts"
+ ],
"nixpkgs": [
"nixpkgs"
],
- "systems": "systems_2",
+ "systems": [
+ "nixos-wsl",
+ "flake-utils",
+ "systems"
+ ],
"terranix-examples": []
},
"locked": {
diff --git a/flake.nix b/flake.nix
index 1610970..ce6fcd5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -347,7 +347,8 @@
url = "github:terranix/terranix";
inputs = {
nixpkgs.follows = "nixpkgs";
- flake-utils.follows = "nixos-wsl/flake-utils";
+ flake-parts.follows = "lanzaboote/flake-parts";
+ systems.follows = "nixos-wsl/flake-utils/systems";
terranix-examples.follows = "";
bats-support.follows = "";
bats-assert.follows = "";