From 6aa6b8f0eb97c9f94b6e9b6b620e46da9810de49 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 13 Nov 2020 22:02:27 +0100 Subject: [PATCH] haskell: drop overrides that have become obsolete in Stackage Nightly --- .../haskell-modules/configuration-common.nix | 15 --------------- .../haskell-modules/configuration-ghc-8.10.x.nix | 16 ---------------- 2 files changed, 31 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9a084b2311a4..b30875774e77 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1395,20 +1395,10 @@ self: super: { liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; }; Diff_0_3_4 = dontCheck super.Diff_0_3_4; - # We want the latest version of cryptonite. This is a first step towards - # resolving https://github.com/NixOS/nixpkgs/issues/81915. - cryptonite = doDistribute self.cryptonite_0_27; - # We want the latest version of Pandoc. - skylighting = doDistribute super.skylighting_0_10_0_3; - skylighting-core = doDistribute super.skylighting-core_0_10_0_3; hslua = doDistribute self.hslua_1_1_2; - jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; - pandoc = doDistribute self.pandoc_2_11_1_1; # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2); - pandoc-types = doDistribute self.pandoc-types_1_22; - rfc5051 = doDistribute self.rfc5051_0_2; # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. domain-auth = dontCheck super.domain-auth; @@ -1421,9 +1411,6 @@ self: super: { autoapply = super.autoapply.override { th-desugar = self.th-desugar_1_11; }; - # binary-instances needs the latest version. - time-compat = self.time-compat_1_9_4; - # - Deps are required during the build for testing and also during execution, # so add them to build input and also wrap the resulting binary so they're in # PATH. @@ -1462,7 +1449,6 @@ self: super: { # in this list or marked as broken anyways haskell-language-server = dontCheck super.haskell-language-server; fourmolu = dontCheck super.fourmolu; - stylish-haskell = super.stylish-haskell_0_12_2_0; ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch { # 2020-11-13: Bumping bounds via an already upstream merged change # https://github.com/haskell/ghcide/pull/905 @@ -1473,7 +1459,6 @@ self: super: { refinery = super.refinery_0_3_0_0; data-tree-print = doJailbreak super.data-tree-print; ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_3; - hie-bios = dontCheck super.hie-bios_0_7_1; lsp-test = dontCheck super.lsp-test_0_11_0_7; hls-plugin-api = super.hls-plugin-api; hls-hlint-plugin = super.hls-hlint-plugin; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index b801a08a9eab..a205c468e6e3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -57,24 +57,15 @@ self: super: { }; }); - # Deviate from Stackage LTS-15.x to fix the build. - haddock-library = self.haddock-library_1_9_0; - # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; system-fileio = doJailbreak super.system-fileio; unliftio-core = doJailbreak super.unliftio-core; # Use the latest version to fix the build. - dhall = self.dhall_1_36_0; - lens = self.lens_4_19_2; optics = self.optics_0_3; - optics-core = self.optics-core_0_3_0_1; optics-extra = self.optics-extra_0_3; optics-th = self.optics-th_0_3_0_2; - repline = self.repline_0_4_0_0; - singletons = self.singletons_2_7; - th-desugar = self.th-desugar_1_11; insert-ordered-containers = super.insert-ordered-containers.override { optics-core = self.optics-core_0_3_0_1; @@ -86,13 +77,6 @@ self: super: { # Jailbreaking because monoidal-containers hasn‘t bumped it's base dependency for 8.10. monoidal-containers = doJailbreak super.monoidal-containers; - # `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need - # the `ghc-lib-parser` dependency on GHC >= 8.8. However, because we have - # multiple verions of `ghc-lib-parser(-ex)` available, and the default ones - # are older ones, those older ones will complain. Because we have a newer - # GHC, we can just set the dependency to `null` as it is not used. - ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = null; }; - # Jailbreak to fix the build. brick = doJailbreak super.brick; exact-pi = doJailbreak super.exact-pi;