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

Merge pull request #91513 from svmhdvn/overrides-3

Browse Source 
haskellPackages: cleaning up obsolete overrides (3/x)
This commit is contained in:
Dennis Gosnell 2020-06-26 13:24:20 +09:00 committed by GitHub
commit 72ad5b7d6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,8 +131,7 @@ self: super: {
ABList = dontCheck super.ABList;
# sse2 flag due to https://github.com/haskell/vector/issues/47.
# dontCheck due to https://github.com/haskell/vector/issues/138
vector = dontCheck (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector);
vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector;
conduit-extra = if pkgs.stdenv.isDarwin
then super.conduit-extra.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; })
@ -185,7 +184,6 @@ self: super: {
# These packages try to execute non-existent external programs.
cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw
dbmigrations = dontCheck super.dbmigrations;
euler = dontCheck super.euler; # https://github.com/decomputed/euler/issues/1
filestore = dontCheck super.filestore;
getopt-generics = dontCheck super.getopt-generics;
graceful = dontCheck super.graceful;
@ -390,9 +388,6 @@ self: super: {
# https://github.com/bos/snappy/issues/1
snappy = dontCheck super.snappy;
# https://github.com/kim/snappy-framing/issues/3
snappy-framing = dontHaddock super.snappy-framing;
# https://ghc.haskell.org/trac/ghc/ticket/9625
vty = dontCheck super.vty;