Skip to content

Commit

Permalink
Fix nix flake check warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed Dec 2, 2020
1 parent 9dae9b9 commit f4e2834
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions flake.nix
@@ -1,12 +1,7 @@
{
description = "Alternative Haskell Infrastructure for Nixpkgs";

outputs = { self }: {
# Using the eval-on-build version here as the plan is that
# `builtins.currentSystem` will not be supported in flakes.
# https://github.com/NixOS/rfcs/pull/49/files#diff-a5a138ca225433534de8d260f225fe31R429
overlay = (self.overlays {sourcesOverride = self.sources;}).combined-eval-on-build;
overlays = import ./overlays;
outputs = { self }: let
config = import ./config.nix;
# We can't import ./nix/sources.nix directly, because that uses nixpkgs to fetch by default,
# and importing nixpkgs without specifying localSystem doesn't work on flakes.
Expand All @@ -21,6 +16,12 @@
inherit (self) config;
overlays = [ self.overlay ];
};
in {
# Using the eval-on-build version here as the plan is that
# `builtins.currentSystem` will not be supported in flakes.
# https://github.com/NixOS/rfcs/pull/49/files#diff-a5a138ca225433534de8d260f225fe31R429
overlay = self.overlays.combined-eval-on-build;
overlays = import ./overlays { sourcesOverride = self.sources; };
legacyPackages = let
genAttrs = lst: f:
builtins.listToAttrs (map (name: {
Expand Down

0 comments on commit f4e2834

Please sign in to comment.