Skip to content

Commit f177bbd

Browse files
committed
fix!: don't pass overlays to fup
BREAKING CHANGES: removes the `overlays` output passed to fup
1 parent dfa0e41 commit f177bbd

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

src/mkFlake/fup-adapter.nix

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,6 @@ let
126126

127127
devshellModules = flake-utils-plus.lib.exportModules config.devshell.exportedModules;
128128

129-
overlays = flake-utils-plus.lib.exportOverlays {
130-
# since we can't detect overlays owned by self
131-
# we have to filter out ones exported by the inputs
132-
# optimally we would want a solution for NixOS/nix#4740
133-
inherit (self) pkgs;
134-
inherit inputs;
135-
};
136-
137129
outputsBuilder = channels:
138130
flake-utils-plus.lib.mergeAny
139131
(defaultOutputsBuilder channels)

src/mkFlake/options.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,7 @@ let
268268
type = with types; pathToOr overlaysType;
269269
default = [ ];
270270
description = escape [ "<" ">" ] ''
271-
overlays to apply to this channel
272-
these will get exported under the 'overlays' flake output
273-
as <channel>/<name> and any overlay pulled from <inputs>
274-
will be filtered out
271+
Overlays to apply to this channel.
275272
'';
276273
};
277274
};

src/mkFlake/outputs-builder.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ in
4646

4747
inherit homeConfigurationsPortable;
4848

49+
# TODO: Should this really happen automatically?
4950
packages = flake-utils-plus.lib.exportPackages self.overlays channels;
5051

5152
devShell =

0 commit comments

Comments
 (0)