From e19cdbebc991fa1e7e3ecd00464c848066841ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 16 Dec 2022 13:49:16 +0100 Subject: [PATCH] haskell.packages.ghc902.haskell-language-server: oops I accidentally committed a test changing `self` to `super` which makes the build fail. We definitely want `self` here, see https://github.com/NixOS/nixpkgs/pull/205902 for why. --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 216648851c95..279acbeca15c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -109,7 +109,8 @@ self: super: { haskell-language-server = let # These aren't included in hackage-packages.nix because hackage2nix is configured for GHC 9.2, under which these plugins aren't supported. - additionalDeps = with super.haskell-language-server.scope; [ hls-haddock-comments-plugin hls-splice-plugin hls-tactics-plugin ]; + # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self..scope` + additionalDeps = with self.haskell-language-server.scope; [ hls-haddock-comments-plugin hls-splice-plugin hls-tactics-plugin ]; in addBuildDepends additionalDeps (super.haskell-language-server.overrideScope (lself: lsuper: { # Needed for modern ormolu and fourmolu. # Apply this here and not in common, because other ghc versions offer different Cabal versions. @@ -117,6 +118,7 @@ self: super: { })); # This package is marked as unbuildable on GHC 9.2, so hackage2nix doesn't include any dependencies. + # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self..scope` hls-haddock-comments-plugin = addBuildDepends (with self.hls-haddock-comments-plugin.scope; [ ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lsp-types unordered-containers ]) super.hls-haddock-comments-plugin;