chore(devshell): Use deploy-rs from nixpkgs for binary caching
This commit is contained in:
parent
ba617d429b
commit
4b86ff5e7b
1 changed files with 18 additions and 3 deletions
21
flake.nix
21
flake.nix
|
|
@ -63,7 +63,6 @@
|
|||
self,
|
||||
nixpkgs,
|
||||
sops-nix,
|
||||
deploy-rs,
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
|
|
@ -78,6 +77,22 @@
|
|||
./configuration/hardware-specific/vm.nix
|
||||
];
|
||||
};
|
||||
|
||||
# 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;
|
||||
};
|
||||
})
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
##################
|
||||
|
|
@ -105,7 +120,7 @@
|
|||
|
||||
profiles.system = {
|
||||
user = "root";
|
||||
path = deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.hetzner-1;
|
||||
path = deployRsPackages.deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.hetzner-1;
|
||||
};
|
||||
|
||||
sshUser = "tlater";
|
||||
|
|
@ -159,7 +174,7 @@
|
|||
|
||||
packages = nixpkgs.lib.attrValues {
|
||||
inherit (sops-nix.packages.${system}) sops-import-keys-hook sops-init-gpg-key;
|
||||
inherit (deploy-rs.packages.${system}) default;
|
||||
inherit (deployRsPackages.deploy-rs) deploy-rs;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue