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

fix some broken haskell packages

Browse Source
This commit is contained in:
Jude Taylor 2015-08-12 11:45:12 -07:00
parent a8d69a7153
commit 6cd4dacebe
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,9 +206,6 @@ self: super: {
# the system-fileio tests use canonicalizePath, which fails in the sandbox # the system-fileio tests use canonicalizePath, which fails in the sandbox
system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio; system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;
# same as above
mockery = if pkgs.stdenv.isDarwin then dontCheck super.mockery else super.mockery;
# Prevents needing to add security_tool as a build tool to all of x509-system's # Prevents needing to add security_tool as a build tool to all of x509-system's
# dependencies. # dependencies.
x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc

4
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -111,6 +111,10 @@ self: super: {
# Test suite has stricter version bounds # Test suite has stricter version bounds
retry = dontCheck super.retry; retry = dontCheck super.retry;
# test/System/Posix/Types/OrphansSpec.hs:19:13:
# Not in scope: type constructor or class ‘Int32’
base-orphans = dontCheck super.base-orphans;
# Test suite fails with time >= 1.5 # Test suite fails with time >= 1.5
http-date = dontCheck super.http-date; http-date = dontCheck super.http-date;