From 9b7110564a67b8132e020ada0899fe2abda3df4a Mon Sep 17 00:00:00 2001
From: Alexander Foremny <aforemny@posteo.de>
Date: Sun, 23 Feb 2025 14:49:13 +0100
Subject: don't clobber `packageOverrides`

---
 pkgs/default.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'pkgs/default.nix')

diff --git a/pkgs/default.nix b/pkgs/default.nix
index f893125..660a462 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,15 +1,19 @@
-{ sources ? import ../nix/sources.nix }:
+{ sources ? import ../nix/sources.nix
+}:
 (self: super:
   let pkgs = self; in
   {
     haskell = super.haskell // {
-      packageOverrides = self: super: {
-        acms = self.callCabal2nix "acms" ../acms { };
-        astore = self.callCabal2nix "astore" sources.json2sql { };
-        autotypes = self.callCabal2nix "autotypes" ../autotypes { };
-        frontend = self.callCabal2nix "frontend" ../frontend { };
-        sh = pkgs.haskell.lib.dontCheck (self.callCabal2nix "sh" sources.sh { });
-        websockets = pkgs.haskell.lib.doJailbreak super.websockets;
-      };
+      packageOverrides = pkgs.lib.composeManyExtensions [
+        super.haskell.packageOverrides
+        (self: super: {
+          acms = self.callCabal2nix "acms" ../acms { };
+          astore = self.callCabal2nix "astore" sources.json2sql { };
+          autotypes = self.callCabal2nix "autotypes" ../autotypes { };
+          frontend = self.callCabal2nix "frontend" ../frontend { };
+          sh = pkgs.haskell.lib.dontCheck (self.callCabal2nix "sh" sources.sh { });
+          websockets = pkgs.haskell.lib.doJailbreak super.websockets;
+        })
+      ];
     };
   })
-- 
cgit v1.2.3