pub-solar/infra
6
1
Fork 3
Code Issues 20 Pull requests 9 Actions Packages Projects 1 Releases Wiki Activity

fix: use deploy-rs overlay to force usage of nixpkgs

Browse source
This commit is contained in:
teutat3s 2023-10-28 14:25:41 +02:00 committed by b12f
parent 49890bc53d
commit 3c9f9c9fc7
Signed by: pub.solar gitea
GPG key ID: F0332B04B7054873
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -91,6 +91,8 @@
}; };
}; };
checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib;
nixosModules = { nixosModules = {
# Common nixos/nix-darwin configuration shared between Linux and macOS. # Common nixos/nix-darwin configuration shared between Linux and macOS.
common = { pkgs, ... }: { common = { pkgs, ... }: {

12
lib/deploy.nix
View file

@ -6,6 +6,16 @@
*/ */
{ lib, inputs }: let { lib, inputs }: let
# https://github.com/serokell/deploy-rs#overall-usage
system = "x86_64-linux";
pkgs = import inputs.nixpkgs { inherit system; };
deployPkgs = import inputs.nixpkgs {
inherit system;
overlays = [
inputs.deploy-rs.overlay
(self: super: { deploy-rs = { inherit (pkgs) deploy-rs; lib = super.deploy-rs.lib; }; })
];
};
getFqdn = c: let getFqdn = c: let
net = c.config.networking; net = c.config.networking;
fqdn = fqdn =
@ -53,7 +63,7 @@ in {
hostname = getFqdn c; hostname = getFqdn c;
profiles.system = { profiles.system = {
user = "root"; user = "root";
path = inputs.deploy-rs.lib.${c.pkgs.stdenv.hostPlatform.system}.activate.nixos c; path = deployPkgs.deploy-rs.lib.activate.nixos c;
}; };
} }
) )