From 024210d44f7dc65a387e61f250b4192807294949 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Mon, 20 Nov 2023 11:42:45 +0800 Subject: [PATCH] haskellPackages.ihaskell: unbreak --- .../haskell-modules/configuration-common.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 92e793c27a4f..7fe56b3f13d0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2696,4 +2696,21 @@ self: super: { libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.buildPackages.git]; }) super.kmonad; + # Both of these need specific versions of ghc-lib-parser, the minor releases + # seem to be tied. + ghc-syntax-highlighter_0_0_10_0 = super.ghc-syntax-highlighter_0_0_10_0.overrideScope(self: super: { + ghc-lib-parser = self.ghc-lib-parser_9_6_3_20231014; + }); + ghc-syntax-highlighter_0_0_11_0 = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: super: { + ghc-lib-parser = self.ghc-lib-parser_9_8_1_20231009; + }); + + # Needs a matching version of ipython-kernel and a + # ghc-syntax-highlighter compatible with a newer ghc-lib-parser it + # transitively pulls in + ihaskell = super.ihaskell.overrideScope (self: super: { + ipython-kernel = self.ipython-kernel_0_11_0_0; + ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super