diff --git a/flake.nix b/flake.nix index 029fd9a..ae23cb6 100644 --- a/flake.nix +++ b/flake.nix @@ -81,21 +81,18 @@ # deploy-rs unfortunately uses an `import nixpkgs`, and its # library functions depend on an instantiated nixpkgs, so we # can't get around multi-nixpkgs-eval. - inherit - (import nixpkgs { - inherit system; - overlays = [ - inputs.deploy-rs.overlays.default - (_: prev: { - deploy-rs = { - inherit (nixpkgs.legacyPackages.${system}) deploy-rs; - inherit (prev.deploy-rs) lib; - }; - }) - ]; - }) - deploy-rs - ; + deployRsPackages = import nixpkgs { + inherit system; + overlays = [ + inputs.deploy-rs.overlays.default + (final: prev: { + deploy-rs = { + inherit (nixpkgs.legacyPackages.${system}) deploy-rs; + inherit (prev.deploy-rs) lib; + }; + }) + ]; + }; in { ################## @@ -123,7 +120,7 @@ profiles.system = { user = "root"; - path = deploy-rs.lib.activate.nixos self.nixosConfigurations.hetzner-1; + path = deployRsPackages.deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.hetzner-1; }; sshUser = "tlater"; @@ -177,7 +174,7 @@ packages = nixpkgs.lib.attrValues { inherit (sops-nix.packages.${system}) sops-import-keys-hook sops-init-gpg-key; - inherit (deploy-rs) deploy-rs; + inherit (deployRsPackages.deploy-rs) deploy-rs; }; };