diff options
| author |  Alexander Foremny <aforemny@posteo.de> | 2025-02-23 14:49:13 +0100 |
|---|---|---|
| committer | Alexander Foremny <aforemny@posteo.de> | 2025-02-23 21:38:33 +0100 |
| commit | 9b7110564a67b8132e020ada0899fe2abda3df4a (patch) | |
| tree | 8db7f9ca6e4b3dd76ab3ebd4887e9b0f5ad8ecb0 /pkgs | |
| parent | cec71796c025d49ad2248f27b6e1055f5a5eb7e2 (diff) | |
don't clobber `packageOverrides`
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/default.nix | 22 |
1 files changed, 13 insertions, 9 deletions
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; + }) + ]; }; }) |