Compare commits

..

2 commits

View file

@ -81,18 +81,10 @@
# deploy-rs unfortunately uses an `import nixpkgs`, and its
# library functions depend on an instantiated nixpkgs, so we
# can't get around multi-nixpkgs-eval.
deployRsPackages = import nixpkgs {
inherit system;
overlays = [
inputs.deploy-rs.overlays.default
(final: prev: {
deploy-rs = {
inherit (nixpkgs.legacyPackages.${system}) deploy-rs;
inherit (prev.deploy-rs) lib;
};
})
];
};
deploy-rs =
(inputs.deploy-rs.overlays.default nixpkgs.legacyPackages.${system}
nixpkgs.legacyPackages.${system}
).deploy-rs;
in
{
##################
@ -120,7 +112,7 @@
profiles.system = {
user = "root";
path = deployRsPackages.deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.hetzner-1;
path = deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.hetzner-1;
};
sshUser = "tlater";
@ -174,7 +166,7 @@
packages = nixpkgs.lib.attrValues {
inherit (sops-nix.packages.${system}) sops-import-keys-hook sops-init-gpg-key;
inherit (deployRsPackages.deploy-rs) deploy-rs;
inherit (deploy-rs) deploy-rs;
};
};