From f1117f27ec333cc801fd04c70b7ba205330b986d Mon Sep 17 00:00:00 2001
From: GTrunSec <gtrunsec@hardenedlinux.org>
Date: Thu, 24 Jun 2021 22:58:26 -0700
Subject: [PATCH] fix hasekllPackages overlay

---
 flake.nix              |  1 -
 overlays/overrides.nix | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/flake.nix b/flake.nix
index 95859a8..fd21f71 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,7 +52,6 @@
             nur.overlay
             agenix.overlay
             nvfetcher.overlay
-            (final: prev: { nvfetcher-bin = nvfetcher.defaultPackage.${final.system}; })
             ./pkgs/default.nix
           ];
         };
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index da1f0ee..6280513 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -14,15 +14,15 @@ channels: final: prev: {
     starship;
 
 
-  haskellPackages = prev.haskellPackages.override {
-    overrides = hfinal: hprev:
-      let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version;
-      in
-      {
-        # same for haskell packages, matching ghc versions
-        inherit (channels.latest.haskell.packages."ghc${version}")
-          haskell-language-server;
-      };
-  };
-
+  haskellPackages = prev.haskellPackages.override
+    (old: {
+      overrides = prev.lib.composeExtensions (old.overrides or (_: _: { })) (hfinal: hprev:
+        let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version;
+        in
+        {
+          # same for haskell packages, matching ghc versions
+          inherit (channels.latest.haskell.packages."ghc${version}")
+            haskell-language-server;
+        });
+    });
 }