diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 52 |
1 files changed, 26 insertions, 26 deletions
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 6f7c794db21..4b0c0754bb8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -55,10 +55,10 @@ self: super: { dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; hackage-security = doJailbreak super.hackage-security; - hashable = overrideCabal (doJailbreak (dontCheck super.hashable)) (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; }); + hashable = overrideCabal (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; }) (doJailbreak (dontCheck super.hashable)); hashable-time = doJailbreak super.hashable-time; - HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }); - integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); + HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP); + integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms); lukko = doJailbreak super.lukko; parallel = doJailbreak super.parallel; primitive = doJailbreak (dontCheck super.primitive); @@ -87,15 +87,15 @@ self: super: { generic-lens_2_2_0_0 = dontCheck super.generic-lens_2_2_0_0; # Apply patches from head.hackage. - alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch { + alex = appendPatch (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch"; sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4"; - }); + }) (dontCheck super.alex); doctest = dontCheck (doJailbreak super.doctest_0_18_1); - language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch { + language-haskell-extract = appendPatch (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch"; sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; - }); + }) (doJailbreak super.language-haskell-extract); # The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x. unordered-containers = dontCheck super.unordered-containers; @@ -131,15 +131,15 @@ self: super: { # Will probably be needed for brittany support # https://github.com/lspitzner/czipwith/pull/2 - #czipwith = appendPatch super.czipwith + #czipwith = appendPatch # (pkgs.fetchpatch { # url = "https://github.com/lspitzner/czipwith/commit/b6245884ae83e00dd2b5261762549b37390179f8.patch"; # sha256 = "08rpppdldsdwzb09fmn0j55l23pwyls2dyzziw3yjc1cm0j5vic5"; - # }); + # }) super.czipwith; # 2021-09-18: https://github.com/mokus0/th-extras/pull/8 # Release is missing, but asked for in the above PR. - th-extras = overrideCabal super.th-extras (old: { + th-extras = overrideCabal (old: { version = assert old.version == "0.0.0.4"; "unstable-2021-09-18"; src = pkgs.fetchFromGitHub { owner = "mokus0"; @@ -148,22 +148,22 @@ self: super: { sha256 = "045f36yagrigrggvyb96zqmw8y42qjsllhhx2h20q25sk5h44xsd"; }; libraryHaskellDepends = old.libraryHaskellDepends ++ [self.th-abstraction]; - }); + }) super.th-extras; # 2021-09-18: GHC 9 compat release is missing # Issue: https://github.com/obsidiansystems/dependent-sum/issues/65 - dependent-sum-template = dontCheck (appendPatch super.dependent-sum-template + dependent-sum-template = dontCheck (appendPatch (pkgs.fetchpatch { url = "https://github.com/obsidiansystems/dependent-sum/commit/8cf4c7fbc3bfa2be475a17bb7c94a1e1e9a830b5.patch"; sha256 = "02wyy0ciicq2x8lw4xxz3x5i4a550mxfidhm2ihh60ni6am498ff"; stripLen = 2; extraPrefix = ""; - })); + }) super.dependent-sum-template); # 2021-09-18: cabal2nix does not detect the need for ghc-api-compat. - hiedb = overrideCabal super.hiedb (old: { + hiedb = overrideCabal (old: { libraryHaskellDepends = old.libraryHaskellDepends ++ [self.ghc-api-compat]; - }); + }) super.hiedb; # 2021-09-18: Need path >= 0.9.0 for ghc 9 compat path = self.path_0_9_0; @@ -174,16 +174,7 @@ self: super: { hls-ormolu-plugin = doJailbreak super.hls-ormolu-plugin; # 2021-09-18: The following plugins don‘t work yet on ghc9. - haskell-language-server = appendConfigureFlags (super.haskell-language-server.override { - hls-tactics-plugin = null; # No upstream support, generic-lens-core fail - hls-splice-plugin = null; # No upstream support in hls 1.4.0, should be fixed in 1.5 - hls-refine-imports-plugin = null; # same issue es splice-plugin - hls-class-plugin = null; # No upstream support - - hls-fourmolu-plugin = null; # No upstream support, needs new fourmolu release - hls-stylish-haskell-plugin = null; # No upstream support - hls-brittany-plugin = null; # No upstream support, needs new brittany release - }) [ + haskell-language-server = appendConfigureFlags [ "-f-tactic" "-f-splice" "-f-refineimports" @@ -192,5 +183,14 @@ self: super: { "-f-fourmolu" "-f-brittany" "-f-stylishhaskell" - ]; + ] (super.haskell-language-server.override { + hls-tactics-plugin = null; # No upstream support, generic-lens-core fail + hls-splice-plugin = null; # No upstream support in hls 1.4.0, should be fixed in 1.5 + hls-refine-imports-plugin = null; # same issue es splice-plugin + hls-class-plugin = null; # No upstream support + + hls-fourmolu-plugin = null; # No upstream support, needs new fourmolu release + hls-stylish-haskell-plugin = null; # No upstream support + hls-brittany-plugin = null; # No upstream support, needs new brittany release + }); } |