Compare commits

...

No commits in common. "0b663f4294f7d02c6b702e64025ebced8c1e8f82" and "280da1932c092278561bca40d414c9731112d6f3" have entirely different histories.

2 changed files with 11 additions and 3 deletions

View File

@ -3,7 +3,10 @@
ghcSrc ? /home/ninjatrappeur/Code/perso/haskell/ghc
}:
let
ghcOverlay = import ./overlays/ghc.nix ghcSrc;
ghcOverlay =
import ./overlays/ghc.nix {
inherit ghcSrc pkgs;
};
nixpkgsConfig = { overlays = [ ghcOverlay ]; };
nixpkgsSrc = (import ./nix/sources.nix).nixpkgs;
pkgs = import nixpkgsSrc nixpkgsConfig;

View File

@ -1,7 +1,12 @@
ghcSrc:
{ ghcSrc, pkgs }:
let
ghcOverride = self: super: {
ghc = super.ghc.overrideDerivation (old: { src = ghcSrc; });
ghc = super.ghc.overrideDerivation (old: {
src = ghcSrc;
rev = "head";
# Necessary to use a non-fetchgit src
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.git ];
});
};
in self: super: {
customGhcHEAD = super.haskell.packages.ghcHEAD.extend ghcOverride;