Expose config.nix for flakes to use (#1238)

This commit is contained in:
Hamish Mackenzie
2021-09-15 23:00:14 +12:00
committed by GitHub
parent a8f5d7be42
commit 19052d83fd
3 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -62,7 +62,7 @@ Add `flake.nix`:
};
})
];
pkgs = import nixpkgs { inherit system overlays; };
pkgs = import nixpkgs { inherit system overlays; inherit (haskellNix) config; };
flake = pkgs.helloProject.flake {
# This adds support for `nix build .#js-unknown-ghcjs-cabal:hello:exe:hello`
crossPlatforms = p: [p.ghcjs];
+1 -1
View File
@@ -188,7 +188,7 @@ Example `flake.nix` file:
};
})
];
pkgs = import nixpkgs { inherit system overlays; };
pkgs = import nixpkgs { inherit system overlays; inherit (haskellNix) config; };
flake = pkgs.helloProject.flake {
# This adds support for `nix build .#js-unknown-ghcjs:hello:exe:hello`
crossPlatforms = p: [p.ghcjs];
+2 -1
View File
@@ -55,11 +55,12 @@
outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, ... }@inputs:
let compiler = "ghc884";
config = import ./config.nix;
in {
inherit config;
overlay = self.overlays.combined;
overlays = import ./overlays { sources = inputs; };
internal = rec {
config = import ./config.nix;
nixpkgsArgs = {
inherit config;
overlays = [ self.overlay ];