[Chore] Fix overlay

Problem: In my recent PR(#264), I accidentally picked overlay output
changes from the philtaken/nixos-vm-tests branch, which broke existing
overlay imports after updating the deploy-rs input.

Solution: Add backwards compatibility so that users don't have to make
changes to their nix flakes.
This commit is contained in:
Sergey Gulin 2024-04-01 14:52:41 +03:00
parent 2bad21828e
commit f10a3aa17c
No known key found for this signature in database
GPG Key ID: 4974F364CB8EDF61
2 changed files with 4 additions and 3 deletions

View File

@ -99,7 +99,7 @@ In the above configuration, `deploy-rs` is built from the flake, not from nixpkg
deployPkgs = import nixpkgs {
inherit system;
overlays = [
deploy-rs.overlay
deploy-rs.overlay # or deploy-rs.overlays.default
(self: super: { deploy-rs = { inherit (pkgs) deploy-rs; lib = super.deploy-rs.lib; }; })
];
};

View File

@ -16,8 +16,8 @@
};
outputs = { self, nixpkgs, utils, ... }@inputs:
{
overlays.default = final: prev: let
rec {
overlay = final: prev: let
system = final.stdenv.hostPlatform.system;
darwinOptions = final.lib.optionalAttrs final.stdenv.isDarwin {
buildInputs = with final.darwin.apple_sdk.frameworks; [
@ -147,6 +147,7 @@
};
};
};
overlays.default = overlay;
} //
utils.lib.eachSystem (utils.lib.defaultSystems ++ ["aarch64-darwin"]) (system:
let