From d63bab81942a866196cb5cbdbacd387896163fc8 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 21 May 2013 04:17:03 -0700 Subject: [PATCH] Some initial Windows fixes --- Stackage/Config.hs | 6 +++++- Stackage/Select.hs | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index e52369c2..c7846de7 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -130,8 +130,12 @@ defaultStablePackages = unPackageMap $ execWriter $ do [ "asn1-data bytedump certificate cipher-aes cipher-rc4 connection" , "cprng-aes cpu crypto-pubkey-types crypto-random-api cryptocipher" , "cryptohash hit language-java libgit pem siphash socks tls" - , "tls-debug tls-extra udbus vhd xenstore" + , "tls-debug tls-extra vhd xenstore" ] +#if !defined(mingw32_HOST_OS) && !defined(__MINGW32__) + -- Does not compile on Windows + add "Vincent Hanquez" "udbus" +#endif mapM_ (add "Edward Kmett ") $ words =<< [ "ad adjunctions bifunctors bound categories charset comonad comonad-transformers" diff --git a/Stackage/Select.hs b/Stackage/Select.hs index 1a896292..5ab262a7 100644 --- a/Stackage/Select.hs +++ b/Stackage/Select.hs @@ -1,4 +1,5 @@ {-# LANGUAGE PatternGuards #-} +{-# LANGUAGE CPP #-} module Stackage.Select ( select , defaultSelectSettings @@ -27,6 +28,11 @@ defaultSelectSettings = SelectSettings , excludedPackages = empty , flags = \coreMap -> Set.fromList (words "blaze_html_0_5") `Set.union` + +#if defined(mingw32_HOST_OS) || defined(__MINGW32__) + -- Needed on Windows to get unix-compat to compile + Set.fromList (words "old-time") `Set.union` +#endif -- Support for containers-unicode-symbols (case Map.lookup (PackageName "containers") coreMap of Just v | Just range <- simpleParse "< 0.5", v `withinRange` range