diff --git a/overlays/30-ghc.nix b/overlays/30-ghc.nix
index ec02fd4b..bb7633c5 100644
--- a/overlays/30-ghc.nix
+++ b/overlays/30-ghc.nix
@@ -1,12 +1,15 @@
 self: super:
-let master = import super.sources.nixpkgs-master { };
+let
+  master = import super.sources.nixpkgs-master { };
+  pkgs = master;
+  inherit (master.haskell.lib) overrideCabal unmarkBroken;
 in {
   myHaskellPackages = {
     inherit (master.haskellPackages)
       brittany ormolu releaser cabal-fmt stack ghcide cabal-install dhall aeson
       unordered-containers shh string-interpolate relude replace-megaparsec
       async say cmdargs megaparsec fdo-notify these neuron taskwarrior pandoc
-      hlint;
+      hlint Cabal cabal2nix;
   };
   ghc = master.ghc.withPackages (_: builtins.attrValues self.myHaskellPackages);
 }