alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

haskell: drop overrides that have become obsolete in Stackage Nightly

Browse source
This commit is contained in:
Peter Simons 2020-11-13 22:02:27 +01:00
parent 8a5501d14d
commit 6aa6b8f0eb
2 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -1395,20 +1395,10 @@ self: super: {
liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; }; liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; };
Diff_0_3_4 = dontCheck super.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. # 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; 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 # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2); 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. # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
domain-auth = dontCheck super.domain-auth; domain-auth = dontCheck super.domain-auth;
@ -1421,9 +1411,6 @@ self: super: {
autoapply = super.autoapply.override { th-desugar = self.th-desugar_1_11; }; 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, # - 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 # so add them to build input and also wrap the resulting binary so they're in
# PATH. # PATH.
@ -1462,7 +1449,6 @@ self: super: {
# in this list or marked as broken anyways # in this list or marked as broken anyways
haskell-language-server = dontCheck super.haskell-language-server; haskell-language-server = dontCheck super.haskell-language-server;
fourmolu = dontCheck super.fourmolu; fourmolu = dontCheck super.fourmolu;
stylish-haskell = super.stylish-haskell_0_12_2_0;
ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch { ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch {
# 2020-11-13: Bumping bounds via an already upstream merged change # 2020-11-13: Bumping bounds via an already upstream merged change
# https://github.com/haskell/ghcide/pull/905 # https://github.com/haskell/ghcide/pull/905
@ -1473,7 +1459,6 @@ self: super: {
refinery = super.refinery_0_3_0_0; refinery = super.refinery_0_3_0_0;
data-tree-print = doJailbreak super.data-tree-print; data-tree-print = doJailbreak super.data-tree-print;
ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_3; 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; lsp-test = dontCheck super.lsp-test_0_11_0_7;
hls-plugin-api = super.hls-plugin-api; hls-plugin-api = super.hls-plugin-api;
hls-hlint-plugin = super.hls-hlint-plugin; hls-hlint-plugin = super.hls-hlint-plugin;

16
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View file

@ -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. # Jailbreak to fix the build.
base-noprelude = doJailbreak super.base-noprelude; base-noprelude = doJailbreak super.base-noprelude;
system-fileio = doJailbreak super.system-fileio; system-fileio = doJailbreak super.system-fileio;
unliftio-core = doJailbreak super.unliftio-core; unliftio-core = doJailbreak super.unliftio-core;
# Use the latest version to fix the build. # 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 = self.optics_0_3;
optics-core = self.optics-core_0_3_0_1;
optics-extra = self.optics-extra_0_3; optics-extra = self.optics-extra_0_3;
optics-th = self.optics-th_0_3_0_2; 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 { insert-ordered-containers = super.insert-ordered-containers.override {
optics-core = self.optics-core_0_3_0_1; 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. # Jailbreaking because monoidal-containers hasn‘t bumped it's base dependency for 8.10.
monoidal-containers = doJailbreak super.monoidal-containers; 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. # Jailbreak to fix the build.
brick = doJailbreak super.brick; brick = doJailbreak super.brick;
exact-pi = doJailbreak super.exact-pi; exact-pi = doJailbreak super.exact-pi;