public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91502 from svmhdvn/overrides-1 

haskellPackages: cleaning up obsolete overrides (1/x)
This commit is contained in:
Dennis Gosnell 2020-06-26 03:06:50 +09:00 committed by GitHub
parent 913724e47c 5018491e05
commit c025ba4b90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1063,10 +1063,6 @@ self: super: {
sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j"; sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j";
}); });
# Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
blank-canvas = dontCheck super.blank-canvas;
blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
# needed because of testing-feat >=0.4.0.2 && <1.1 # needed because of testing-feat >=0.4.0.2 && <1.1
language-ecmascript = doJailbreak super.language-ecmascript; language-ecmascript = doJailbreak super.language-ecmascript;
@ -1108,7 +1104,7 @@ self: super: {
# https://github.com/danfran/cabal-macosx/issues/13 # https://github.com/danfran/cabal-macosx/issues/13
cabal-macosx = dontCheck super.cabal-macosx; cabal-macosx = dontCheck super.cabal-macosx;
# https://github.com/DanielG/cabal-helper/issues/59 # https://github.com/DanielG/cabal-helper/pull/123
cabal-helper = doJailbreak super.cabal-helper; cabal-helper = doJailbreak super.cabal-helper;
# TODO(Profpatsch): factor out local nix store setup from # TODO(Profpatsch): factor out local nix store setup from
@ -1128,9 +1124,6 @@ self: super: {
# https://github.com/mgajda/json-autotype/issues/25 # https://github.com/mgajda/json-autotype/issues/25
json-autotype = dontCheck super.json-autotype; json-autotype = dontCheck super.json-autotype;
# Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30
tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1
# Requires pg_ctl command during tests # Requires pg_ctl command during tests
beam-postgres = overrideCabal super.beam-postgres (drv: { beam-postgres = overrideCabal super.beam-postgres (drv: {
testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql]; testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql];
@ -1161,8 +1154,7 @@ self: super: {
xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;
# Some tests depend on a postgresql instance # Some tests depend on a postgresql instance
# Haddock failure: https://github.com/haskell/haddock/issues/979 esqueleto = dontCheck super.esqueleto;
esqueleto = dontHaddock (dontCheck super.esqueleto);
# Requires API keys to run tests # Requires API keys to run tests
algolia = dontCheck super.algolia; algolia = dontCheck super.algolia;

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -2548,7 +2548,6 @@ extra-packages:
- apply-refact == 0.8.0.0 # works with GHC 8.10.x https://hackage.haskell.org/package/apply-refact/changelog - apply-refact == 0.8.0.0 # works with GHC 8.10.x https://hackage.haskell.org/package/apply-refact/changelog
- binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers
- binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers
- blank-canvas < 0.6.3 # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.*
- Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.2.* # required for jailbreak-cabal etc.
- Cabal == 2.4.* # required for cabal-install etc. - Cabal == 2.4.* # required for cabal-install etc.
- colour < 2.3.4 # newer versions don't support GHC 7.10.x - colour < 2.3.4 # newer versions don't support GHC 7.10.x