summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock140
-rw-r--r--flake.nix3
2 files changed, 14 insertions, 129 deletions
diff --git a/flake.lock b/flake.lock
index 2a13ada..c806735 100644
--- a/flake.lock
+++ b/flake.lock
@@ -102,32 +102,6 @@
"type": "github"
}
},
- "effects": {
- "inputs": {
- "flake-parts": "flake-parts_2",
- "hercules-ci-agent": [
- "getchoo",
- "hercules-ci-agent"
- ],
- "nixpkgs": [
- "getchoo",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1689397210,
- "narHash": "sha256-fVxZnqxMbsDkB4GzGAs/B41K0wt/e+B/fLxmTFF/S20=",
- "owner": "hercules-ci",
- "repo": "hercules-ci-effects",
- "rev": "0a63bfa3f00a3775ea3a6722b247880f1ffe91ce",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "hercules-ci-effects",
- "type": "github"
- }
- },
"flake-compat": {
"flake": false,
"locked": {
@@ -180,23 +154,6 @@
"type": "github"
}
},
- "flake-parts_2": {
- "inputs": {
- "nixpkgs-lib": "nixpkgs-lib"
- },
- "locked": {
- "lastModified": 1688466019,
- "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
- "type": "github"
- },
- "original": {
- "id": "flake-parts",
- "type": "indirect"
- }
- },
"flake-utils": {
"inputs": {
"systems": "systems"
@@ -217,15 +174,21 @@
},
"getchoo": {
"inputs": {
- "effects": "effects",
+ "effects": [
+ "hercules-ci-effects"
+ ],
"flake-compat": [
"flake-compat"
],
- "hercules-ci-agent": "hercules-ci-agent",
+ "hercules-ci-agent": [
+ "hercules-ci-agent"
+ ],
"nixpkgs": [
"nixpkgs"
],
- "parts": "parts"
+ "parts": [
+ "flake-parts"
+ ]
},
"locked": {
"lastModified": 1692576435,
@@ -301,54 +264,12 @@
"type": "github"
}
},
- "haskell-flake_2": {
- "locked": {
- "lastModified": 1684780604,
- "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
- "owner": "srid",
- "repo": "haskell-flake",
- "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
- "type": "github"
- },
- "original": {
- "owner": "srid",
- "ref": "0.3.0",
- "repo": "haskell-flake",
- "type": "github"
- }
- },
"hercules-ci-agent": {
"inputs": {
"flake-parts": [
- "getchoo",
- "parts"
- ],
- "haskell-flake": "haskell-flake",
- "nixpkgs": [
- "getchoo",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1688568579,
- "narHash": "sha256-ON0M56wtY/TIIGPkXDlJboAmuYwc73Hi8X9iJGtxOhM=",
- "owner": "hercules-ci",
- "repo": "hercules-ci-agent",
- "rev": "367dd8cd649b57009a6502e878005a1e54ad78c5",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "hercules-ci-agent",
- "type": "github"
- }
- },
- "hercules-ci-agent_2": {
- "inputs": {
- "flake-parts": [
"flake-parts"
],
- "haskell-flake": "haskell-flake_2",
+ "haskell-flake": "haskell-flake",
"nixpkgs": [
"nixpkgs"
]
@@ -521,24 +442,6 @@
"type": "indirect"
}
},
- "nixpkgs-lib": {
- "locked": {
- "dir": "lib",
- "lastModified": 1688049487,
- "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
- "type": "github"
- },
- "original": {
- "dir": "lib",
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs-stable": {
"locked": {
"lastModified": 1692525914,
@@ -589,27 +492,6 @@
"type": "github"
}
},
- "parts": {
- "inputs": {
- "nixpkgs-lib": [
- "getchoo",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1690933134,
- "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
"pre-commit-hooks": {
"inputs": {
"flake-compat": [
@@ -678,7 +560,7 @@
"flake-utils": "flake-utils",
"getchoo": "getchoo",
"guzzle_api": "guzzle_api",
- "hercules-ci-agent": "hercules-ci-agent_2",
+ "hercules-ci-agent": "hercules-ci-agent",
"hercules-ci-effects": "hercules-ci-effects",
"home-manager": "home-manager",
"lanzaboote": "lanzaboote",
diff --git a/flake.nix b/flake.nix
index 12d3a48..1c59c2d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,6 +52,9 @@
url = "github:getchoo/nix-exprs";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat";
+ inputs.effects.follows = "hercules-ci-effects";
+ inputs.parts.follows = "flake-parts";
+ inputs.hercules-ci-agent.follows = "hercules-ci-agent";
};
guzzle_api = {