deploy-rs: use the cached version for real

looks like it works this time
This commit is contained in:
Motiejus Jakštys 2023-09-15 15:39:27 +03:00
parent e767589a67
commit 40dd311cc6
1 changed files with 8 additions and 10 deletions

View File

@ -38,12 +38,10 @@
nur, nur,
} @ inputs: let } @ inputs: let
myData = import ./data.nix; myData = import ./data.nix;
systemIA64 = "x86_64-linux"; pkgsIA64 = import nixpkgs {system = "x86_64-linux";};
systemArm64 = "aarch64-linux"; pkgsArm64 = import nixpkgs {system = "aarch64-linux";};
pkgsIA64 = import nixpkgs {inherit systemIA64;};
pkgsArm64 = import nixpkgs {inherit systemArm64;};
deployPkgsIA64 = import nixpkgs { deployPkgsIA64 = import nixpkgs {
inherit systemIA64; system = "x86_64-linux";
overlays = [ overlays = [
deploy-rs.overlay deploy-rs.overlay
(self: super: { (self: super: {
@ -55,7 +53,7 @@
]; ];
}; };
deployPkgsArm64 = import nixpkgs { deployPkgsArm64 = import nixpkgs {
inherit systemArm64; system = "aarch64-linux";
overlays = [ overlays = [
deploy-rs.overlay deploy-rs.overlay
(self: super: { (self: super: {
@ -180,7 +178,7 @@
system = { system = {
sshUser = "motiejus"; sshUser = "motiejus";
path = path =
deployPkgsIA64.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.vno1-oh2; deployPkgsIA64.deploy-rs.lib.activate.nixos self.nixosConfigurations.vno1-oh2;
user = "root"; user = "root";
}; };
}; };
@ -192,7 +190,7 @@
system = { system = {
sshUser = "motiejus"; sshUser = "motiejus";
path = path =
deployPkgsIA64.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.fwminex; deployPkgsIA64.deploy-rs.lib.activate.nixos self.nixosConfigurations.fwminex;
user = "root"; user = "root";
}; };
}; };
@ -204,7 +202,7 @@
system = { system = {
sshUser = "motiejus"; sshUser = "motiejus";
path = path =
deployPkgsArm64.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.vno3-rp3b; deployPkgsArm64.deploy-rs.lib.activate.nixos self.nixosConfigurations.vno3-rp3b;
user = "root"; user = "root";
}; };
}; };
@ -216,7 +214,7 @@
system = { system = {
sshUser = "motiejus"; sshUser = "motiejus";
path = path =
deployPkgsArm64.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.fra1-a; deployPkgsArm64.deploy-rs.lib.activate.nixos self.nixosConfigurations.fra1-a;
user = "root"; user = "root";
}; };
}; };