about summary refs log tree commit diff
path: root/third_party
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-04-10T12·12+0200
committertazjin <mail@tazj.in>2021-04-10T15·23+0000
commite6d1e68f4add807b94173788b9e53da98b4e255b (patch)
treefa2bbb6eccc0d1b09e12d8772129c21d7a04bce0 /third_party
parent6489d94ad60c431d27836a0bc65953e44175b262 (diff)
refactor(3p/overlays): Move haskell overlay to new tree location r/2466
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>
Diffstat (limited to 'third_party')
-rw-r--r--third_party/nixpkgs-exposed/exposed/default.nix4
-rw-r--r--third_party/overlays/haskell/default.nix (renamed from third_party/nixpkgs-exposed/haskell_overlay/default.nix)6
-rw-r--r--third_party/overlays/haskell/patches/generic-arbitrary-export-garbitrary.patch (renamed from third_party/nixpkgs-exposed/haskell_overlay/patches/generic-arbitrary-export-garbitrary.patch)0
3 files changed, 8 insertions, 2 deletions
diff --git a/third_party/nixpkgs-exposed/exposed/default.nix b/third_party/nixpkgs-exposed/exposed/default.nix
index 3d3e23afab46..478b55cb2965 100644
--- a/third_party/nixpkgs-exposed/exposed/default.nix
+++ b/third_party/nixpkgs-exposed/exposed/default.nix
@@ -190,7 +190,9 @@
     ;
 
   haskellPackages = (nixpkgs.haskellPackages.override {
-    overrides = (import ../haskell_overlay { pkgs = nixpkgs; });
+    overrides = (import ../../overlays/haskell
+    { /* empty readTree arg */ }
+    { pkgs = nixpkgs; });
   });
 
   gradle_6 = (nixpkgs.gradleGen.override {
diff --git a/third_party/nixpkgs-exposed/haskell_overlay/default.nix b/third_party/overlays/haskell/default.nix
index 9b025d7d2828..975918803e29 100644
--- a/third_party/nixpkgs-exposed/haskell_overlay/default.nix
+++ b/third_party/overlays/haskell/default.nix
@@ -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 {
   generic-arbitrary = appendPatch
diff --git a/third_party/nixpkgs-exposed/haskell_overlay/patches/generic-arbitrary-export-garbitrary.patch b/third_party/overlays/haskell/patches/generic-arbitrary-export-garbitrary.patch
index f0c936bfca18..f0c936bfca18 100644
--- a/third_party/nixpkgs-exposed/haskell_overlay/patches/generic-arbitrary-export-garbitrary.patch
+++ b/third_party/overlays/haskell/patches/generic-arbitrary-export-garbitrary.patch