@@ -1,12 +1,7 @@
11{
22 description = "Alternative Haskell Infrastructure for Nixpkgs";
33
4− outputs = { self }: {
5− # Using the eval-on-build version here as the plan is that
6− # `builtins.currentSystem` will not be supported in flakes.
7− # https://github.com/NixOS/rfcs/pull/49/files#diff-a5a138ca225433534de8d260f225fe31R429
8− overlay = (self.overlays {sourcesOverride = self.sources;}).combined-eval-on-build;
9− overlays = import ./overlays;
4+ outputs = { self }: let
105 config = import ./config.nix;
116 # We can't import ./nix/sources.nix directly, because that uses nixpkgs to fetch by default,
127 # and importing nixpkgs without specifying localSystem doesn't work on flakes.
@@ -21,6 +16,12 @@
2116 inherit (self) config;
2217 overlays = [ self.overlay ];
2318 };
19+ in {
20+ # Using the eval-on-build version here as the plan is that
21+ # `builtins.currentSystem` will not be supported in flakes.
22+ # https://github.com/NixOS/rfcs/pull/49/files#diff-a5a138ca225433534de8d260f225fe31R429
23+ overlay = self.overlays.combined-eval-on-build;
24+ overlays = import ./overlays { sourcesOverride = self.sources; };
2425 legacyPackages = let
2526 genAttrs = lst: f:
2627 builtins.listToAttrs (map (name: {