motiejus
/
config
1
Fork 0
Code Packages Releases Activity

overlays: fix 1

This commit is contained in:
Motiejus Jakštys 2024-02-02 15:29:53 +02:00
parent 64c4534d46
commit 8f79a933e7
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flake.nix
View File

@ -91,24 +91,24 @@
mkDeployPkgs = system: mkDeployPkgs = system:
import nixpkgs { import nixpkgs {
inherit system; inherit system;
overlays = mkOverlays system;
overlays = [
deploy-rs.overlay
(_self: super: {
deploy-rs = {
inherit (import nixpkgs {inherit system;}) deploy-rs;
inherit (super.deploy-rs) lib;
};
})
];
}; };
deployPkgsIA64 = mkDeployPkgs "x86_64-linux"; deployPkgsIA64 = mkDeployPkgs "x86_64-linux";
deployPkgsArm64 = mkDeployPkgs "aarch64-linux"; deployPkgsArm64 = mkDeployPkgs "aarch64-linux";
# accepting "system" argument in case we need to construct # accepting "system" argument in case we need to construct
# nixpkgs-unstable. See git log around the switch from 23.05 to 23.11. # nixpkgs-unstable. See git log around the switch from 23.05 to 23.11.
mkOverlays = _: [ mkOverlays = system: [
nur.overlay nur.overlay
e11sync.overlays.default e11sync.overlays.default
deploy-rs.overlay
(_self: super: {
deploy-rs = {
inherit (import nixpkgs {inherit system;}) deploy-rs;
inherit (super.deploy-rs) lib;
};
})
]; ];
in in
{ {

4
modules/services/deployerbot/default.nix
View File

@ -9,7 +9,7 @@
pingTarget, pingTarget,
}: '' }: ''
if ${pkgs.inetutils}/bin/ping -c 1 ${pingTarget}; then if ${pkgs.inetutils}/bin/ping -c 1 ${pingTarget}; then
${pkgs.deploy-rs}/bin/deploy \ ${pkgs.deploy-rs.deploy-rs}/bin/deploy \
--ssh-opts="-i ''${CREDENTIALS_DIRECTORY}/ssh-key" \ --ssh-opts="-i ''${CREDENTIALS_DIRECTORY}/ssh-key" \
--ssh-user=deployerbot-follower \ --ssh-user=deployerbot-follower \
--confirm-timeout 60 \ --confirm-timeout 60 \
@ -85,7 +85,7 @@ in {
nix flake update --accept-flake-config --commit-lock-file nix flake update --accept-flake-config --commit-lock-file
${pkgs.deploy-rs}/bin/deploy \ ${pkgs.deploy-rs.deploy-rs}/bin/deploy \
--ssh-opts="-i ''${CREDENTIALS_DIRECTORY}/ssh-key" \ --ssh-opts="-i ''${CREDENTIALS_DIRECTORY}/ssh-key" \
--ssh-user=deployerbot-follower \ --ssh-user=deployerbot-follower \
--confirm-timeout 60 \ --confirm-timeout 60 \