only inherit inputs

This commit is contained in:
do butterflies cry? 2026-02-15 13:43:19 +10:00
parent 93aa29dc10
commit 07ad32475f
3 changed files with 15 additions and 18 deletions

View file

@ -13,7 +13,7 @@
# limitations under the License.
{
mix,
deploy-rs,
inputs,
...
} @ args:
mix.newMixture args (mixture: {
@ -31,12 +31,6 @@ mix.newMixture args (mixture: {
overlays = [
# build deploy-rs as a package not from the flake input,
# hence we can rely on a nixpkg binary cache.
deploy-rs.overlays.default
# (self: super: {
# deploy-rs = {
# inherit (super) deploy-rs;
# lib = super.deploy-rs.lib;
# };
# })
inputs.deploy-rs.overlays.default
];
})

View file

@ -16,7 +16,7 @@
this,
nt,
lib,
deploy-rs,
inputs,
...
}: let
inherit
@ -192,7 +192,7 @@ in {
// {
inherit root specialArgs;
inherit (node) system;
_deploy-rs = deploy-rs;
_deploy-rs = inputs.deploy-rs;
};
in
specialArgs;
@ -220,7 +220,7 @@ in {
user
;
nixosFor = system: deploy-rs.lib.${system}.activate.nixos;
nixosFor = system: inputs.deploy-rs.lib.${system}.activate.nixos;
in {
hostname = ssh.host;
@ -256,7 +256,7 @@ in {
};
});
checks = mapAttrs (system: deployLib: deployLib.deployChecks deploy) deploy-rs.lib;
checks = mapAttrs (system: deployLib: deployLib.deployChecks deploy) inputs.deploy-rs.lib;
};
in
outputs // customOutputs;

View file

@ -22,7 +22,10 @@
nt.url = "github:cry128/nt";
deploy-rs.url = "github:serokell/deploy-rs";
deploy-rs = {
url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {
@ -31,9 +34,9 @@
...
} @ inputs:
import ./cerulean
(inputs
// {
{
inherit inputs;
inherit (nixpkgs) lib;
inherit (nt) mix;
});
};
}