From e6d1e68f4add807b94173788b9e53da98b4e255b Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 10 Apr 2021 14:12:25 +0200 Subject: [PATCH] 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 --- third_party/nixpkgs-exposed/exposed/default.nix | 4 +++- .../haskell_overlay => overlays/haskell}/default.nix | 6 +++++- .../patches/generic-arbitrary-export-garbitrary.patch | 0 3 files changed, 8 insertions(+), 2 deletions(-) rename third_party/{nixpkgs-exposed/haskell_overlay => overlays/haskell}/default.nix (79%) rename third_party/{nixpkgs-exposed/haskell_overlay => overlays/haskell}/patches/generic-arbitrary-export-garbitrary.patch (100%) diff --git a/third_party/nixpkgs-exposed/exposed/default.nix b/third_party/nixpkgs-exposed/exposed/default.nix index 3d3e23afa..478b55cb2 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 similarity index 79% rename from third_party/nixpkgs-exposed/haskell_overlay/default.nix rename to third_party/overlays/haskell/default.nix index 9b025d7d2..975918803 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 similarity index 100% rename from third_party/nixpkgs-exposed/haskell_overlay/patches/generic-arbitrary-export-garbitrary.patch rename to third_party/overlays/haskell/patches/generic-arbitrary-export-garbitrary.patch