From 9202fa86789db5415c1fe0e03e7a89c0977b21b4 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Thu, 15 Jan 2026 13:09:28 +1000 Subject: [PATCH] move overlays from flake.nix -> cerulean/default.nix --- cerulean/default.nix | 18 +++++++++++++++++- flake.nix | 23 ++++++----------------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/cerulean/default.nix b/cerulean/default.nix index e72374e..d100652 100644 --- a/cerulean/default.nix +++ b/cerulean/default.nix @@ -11,10 +11,26 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -{mix, ...} @ inputs: +{ + mix, + deploy-rs, + ... +} @ inputs: mix.mkMod (mix.newMixture {specialArgs = inputs;}) (mixture: { includes.public = [ ./flake-config ]; + + overlays = [ + # build deploy-rs as a package not from the flake input, + # hence we can rely on a nixpkg binary cache. + deploy-rs.overlays.default + (self: super: { + deploy-rs = { + inherit (super) deploy-rs; + lib = super.deploy-rs.lib; + }; + }) + ]; }) diff --git a/flake.nix b/flake.nix index 94a4094..6de0367 100644 --- a/flake.nix +++ b/flake.nix @@ -35,10 +35,12 @@ nixpkgs, nixpkgs-unstable, nib, - deploy-rs, ... } @ inputs: let - lib = nixpkgs.lib; + inherit + (nixpkgs) + lib + ; sys = nib.mkUSys { pkgs = nib.withPkgs nixpkgs { @@ -49,19 +51,6 @@ config.allowUnfree = false; }; }; - - cerulean = import ./cerulean {inherit inputs lib sys;}; - in { - overlays = [ - # build deploy-rs as a package not from the flake input, - # hence we can rely on a nixpkg binary cache. - deploy-rs.overlays.default - (self: super: { - deploy-rs = { - inherit (super) deploy-rs; - lib = super.deploy-rs.lib; - }; - }) - ]; - }; + in + import ./cerulean <| inputs // {inherit lib sys;}; }