From 0b6c3228087b028d184323101ad87bc0d8301d97 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sun, 11 Oct 2020 14:49:23 +0300 Subject: [PATCH] haskellPackages.stylish-haskell: unpin The reason of the pinning was fixed by the 0.12 release, now 0.12.2 is released. Currently, Haskell Language Server Nix env development environment does not work, so it is essentially impossible to develop HLS under NixOS, HLS requirements of environment coerce on the stylish-haskell>=0.12 and looks at haskellPackages.stylish-haskell. M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c85245255cd..f9d4ed7afce 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1464,14 +1464,6 @@ self: super: { pandoc-types = doDistribute self.pandoc-types_1_21; rfc5051 = doDistribute self.rfc5051_0_2; - # Upstream forgot to change the Cabal version bounds in the test suite. - # See: https://github.com/jaspervdj/stylish-haskell/pull/297 - # Will be fixed whenever they next bump the version number - stylish-haskell = appendPatch super.stylish-haskell (pkgs.fetchpatch { - url = "https://github.com/jaspervdj/stylish-haskell/commit/9550aa1cd177aa6fe271d075177109d66a79e67f.patch"; - sha256 = "1ffnbd2s4fx0ylnnlcyyag119yxb32p5r20b38l39lsa0jwv229f"; - }); - # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. domain-auth = dontCheck super.domain-auth; # INSERT NEW OVERRIDES ABOVE THIS LINE