From 706cf3bac263e4f98b26f746377b39b42f93d55a Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 1 Mar 2023 09:48:35 +0000 Subject: [PATCH] cross.nix: move to subdir --- hosts/common/{cross.nix => cross/default.nix} | 4 ++-- hosts/common/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename hosts/common/{cross.nix => cross/default.nix} (99%) diff --git a/hosts/common/cross.nix b/hosts/common/cross/default.nix similarity index 99% rename from hosts/common/cross.nix rename to hosts/common/cross/default.nix index 25d97da1..674ce64c 100644 --- a/hosts/common/cross.nix +++ b/hosts/common/cross/default.nix @@ -83,8 +83,8 @@ let # these are the overlays which we *also* pass through to the cross and emulated package sets. # TODO: refactor to not specify same overlay in multiple places (here and flake.nix). overlays = [ - (import ./../../overlays/pkgs.nix) - (import ./../../overlays/pins.nix) + (import ./../../../overlays/pkgs.nix) + (import ./../../../overlays/pins.nix) ]; mkCrossFrom = localSystem: pkgs: import pkgs.path { diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 593fe630..2387e833 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -1,7 +1,7 @@ { lib, pkgs, ... }: { imports = [ - ./cross.nix + ./cross ./feeds.nix ./fs.nix ./hardware.nix