From 25ba6b6bf253fe0a2683bd2919c8320a82385390 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sun, 23 Feb 2025 18:45:37 +0100 Subject: update ghc to 9.10 --- pkgs/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'pkgs/default.nix') diff --git a/pkgs/default.nix b/pkgs/default.nix index 660a462..cc883c0 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,18 +1,27 @@ { sources ? import ../nix/sources.nix }: (self: super: - let pkgs = self; in + let + pkgs = self; + haskellLib = pkgs.haskell.lib; + in { haskell = super.haskell // { packageOverrides = pkgs.lib.composeManyExtensions [ super.haskell.packageOverrides (self: super: { acms = self.callCabal2nix "acms" ../acms { }; - astore = self.callCabal2nix "astore" sources.json2sql { }; + astore = haskellLib.doJailbreak (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; + sh = haskellLib.dontCheck (self.callCabal2nix "sh" sources.sh { }); + repline = haskellLib.doJailbreak super.repline; + uuid = haskellLib.doJailbreak super.uuid; + websockets = haskellLib.doJailbreak super.websockets; + hinotify = super.hinotify.overrideAttrs (_: { + version = "0.4.2"; + src = builtins.fetchTarball "https://hackage.haskell.org/package/hinotify-0.4.2/hinotify-0.4.2.tar.gz"; + }); }) ]; }; -- cgit v1.2.3