remove mkDeployPkgs*

This commit is contained in:
Motiejus Jakštys 2024-02-02 15:44:59 +02:00
parent 9002134724
commit e164a3beeb

View File

@ -88,12 +88,7 @@
... ...
} @ inputs: let } @ inputs: let
myData = import ./data.nix; myData = import ./data.nix;
mkDeployPkgs = system:
import nixpkgs {inherit system overlays;};
deployPkgsIA64 = mkDeployPkgs "x86_64-linux";
deployPkgsArm64 = mkDeployPkgs "aarch64-linux";
# accepting "system" argument in case we need to construct
# nixpkgs-unstable. See git log around the switch from 23.05 to 23.11.
overlays = [ overlays = [
nur.overlay nur.overlay
e11sync.overlays.default e11sync.overlays.default
@ -241,7 +236,7 @@
system = { system = {
sshUser = "motiejus"; sshUser = "motiejus";
path = path =
deployPkgsIA64.deploy-rs.lib.activate.nixos self.nixosConfigurations.vno1-oh2; self.nixosConfigurations.vno1-oh2.pkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.vno1-oh2;
user = "root"; user = "root";
}; };
}; };
@ -253,7 +248,7 @@
system = { system = {
sshUser = "motiejus"; sshUser = "motiejus";
path = path =
deployPkgsIA64.deploy-rs.lib.activate.nixos self.nixosConfigurations.fwminex; self.nixosConfigurations.fwminex.pkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.fwminex;
user = "root"; user = "root";
}; };
}; };
@ -265,7 +260,7 @@
system = { system = {
sshUser = "motiejus"; sshUser = "motiejus";
path = path =
deployPkgsArm64.deploy-rs.lib.activate.nixos self.nixosConfigurations.vno3-rp3b; self.nixosConfigurations.vno3-rp3b.pkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.vno3-rp3b;
user = "root"; user = "root";
}; };
}; };
@ -277,7 +272,7 @@
system = { system = {
sshUser = "motiejus"; sshUser = "motiejus";
path = path =
deployPkgsArm64.deploy-rs.lib.activate.nixos self.nixosConfigurations.fra1-a; self.nixosConfigurations.fra1-a.pkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.fra1-a;
user = "root"; user = "root";
}; };
}; };