From 5ab157f0d5dccb8995864815dfdd3ac2c6630cba Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Thu, 11 Jan 2024 12:56:52 +0100 Subject: [PATCH] Revert "fix: avoid endlessly compiling deploy-rs" This reverts commit 86d49ee26046b207739e165a92254913854b4a43. --- lib/deploy.nix | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/lib/deploy.nix b/lib/deploy.nix index 9a2f7a53..5e9f6418 100644 --- a/lib/deploy.nix +++ b/lib/deploy.nix @@ -1,23 +1,11 @@ /* -* The contents of this file are adapted from digga -* https://github.com/divnix/digga -* -* Licensed under the MIT license -*/ -{ - 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; }; }) - ]; - }; + * The contents of this file are adapted from digga + * https://github.com/divnix/digga + * + * Licensed under the MIT license + */ + +{ lib, inputs }: let getFqdn = c: let net = c.config.networking; fqdn = @@ -65,7 +53,7 @@ in { hostname = getFqdn c; profiles.system = { user = "root"; - path = deployPkgs.deploy-rs.lib.activate.nixos c; + path = inputs.deploy-rs.lib.${c.pkgs.stdenv.hostPlatform.system}.activate.nixos c; }; } )