From 952ebcf65f996a459141be786b349e7886b1b216 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 20 Jan 2021 17:13:24 +0100 Subject: [PATCH] haskellPackages.haskell-language-server: Fixing build by pinning apply-refact --- .../haskell-modules/configuration-common.nix | 4 +++ .../configuration-hackage2nix.yaml | 1 + .../haskell-modules/hackage-packages.nix | 31 +++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e2d17a8a69f099..4c161c453c5bcf 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1420,6 +1420,10 @@ self: super: { lsp-test = dontCheck self.lsp-test_0_11_0_7; fourmolu = self.fourmolu_0_3_0_0; }); + # 2021-01-20 + # apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0 + # https://github.com/haskell/haskell-language-server/issues/1240 + apply-refact = super.apply-refact_0_8_2_1; fourmolu = dontCheck super.fourmolu; # 1. test requires internet diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c74a4c8c972319..1587e1dba618ee 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2700,6 +2700,7 @@ extra-packages: - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - ghcide == 0.7.0.0 # Needed for hls 0.8.0 + - apply-refact == 0.8.2.1 # Needed for hls 0.8.0 package-maintainers: peti: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 520f21ec89984d..17d5c8968e6555 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -31748,6 +31748,37 @@ self: { broken = true; }) {}; + "apply-refact_0_8_2_1" = callPackage + ({ mkDerivation, base, containers, directory, extra, filemanip + , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative + , process, refact, silently, syb, tasty, tasty-expected-failure + , tasty-golden, transformers, unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.8.2.1"; + sha256 = "12dnwsv37bhla7cnqa3h24mnvdk5199lwd5mf845n1r6xqrh2vvp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory extra filemanip ghc ghc-exactprint + process refact syb transformers unix-compat + ]; + executableHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint optparse-applicative process refact syb transformers + unix-compat + ]; + testHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint optparse-applicative process refact silently syb + tasty tasty-expected-failure tasty-golden transformers unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, extra, filemanip , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative