refactor(3p/overlays): Move haskell overlay to new tree location

nixpkgs_exposed is going away, and the haskell overlay is independent
from that.

See also b/108, cl/2910

Change-Id: I3aea6dfc427a914f3f88146fd0b45d60dfd45a1a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2918
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2021-04-10 14:12:25 +02:00 committed by tazjin
parent 6489d94ad6
commit e6d1e68f4a
3 changed files with 8 additions and 2 deletions

View file

@ -190,7 +190,9 @@
; ;
haskellPackages = (nixpkgs.haskellPackages.override { haskellPackages = (nixpkgs.haskellPackages.override {
overrides = (import ../haskell_overlay { pkgs = nixpkgs; }); overrides = (import ../../overlays/haskell
{ /* empty readTree arg */ }
{ pkgs = nixpkgs; });
}); });
gradle_6 = (nixpkgs.gradleGen.override { gradle_6 = (nixpkgs.gradleGen.override {

View file

@ -1,4 +1,8 @@
{ pkgs }: # Defines overrides for Haskell packages, for example to avoid
# breakage currently present in nixpkgs or to modify package versions.
{ ... }: # This file needs nothing from readTree
{ pkgs }: # ... but is called with a separate package set in the overlay
self: super: with pkgs.haskell.lib; rec { self: super: with pkgs.haskell.lib; rec {
generic-arbitrary = appendPatch generic-arbitrary = appendPatch