on master help sign in
Some initial Windows fixes
commitd63bab81942a866196cb5cbdbacd387896163fc8 authorMichael Snoyman <michael@snoyman.com> dateTue 21 May 2013, 04:17 (13 years ago) parentfba57b7
2 files changed+11−1
Stackage/Config.hs+5−1 Stackage/Select.hs+6
Stackage/Config.hs+5−1
@@ -130,8 +130,12 @@ defaultStablePackages = unPackageMap $ execWriter $ do
130130 [ "asn1-data bytedump certificate cipher-aes cipher-rc4 connection"
131131 , "cprng-aes cpu crypto-pubkey-types crypto-random-api cryptocipher"
132132 , "cryptohash hit language-java libgit pem siphash socks tls"
133− , "tls-debug tls-extra udbus vhd xenstore"
133+ , "tls-debug tls-extra vhd xenstore"
134134 ]
135+#if !defined(mingw32_HOST_OS) && !defined(__MINGW32__)
136+ -- Does not compile on Windows
137+ add "Vincent Hanquez" "udbus"
138+#endif
135139
136140 mapM_ (add "Edward Kmett <ekmett@gmail.com>") $ words =<<
137141 [ "ad adjunctions bifunctors bound categories charset comonad comonad-transformers"
Stackage/Select.hs+6
@@ -1,4 +1,5 @@
11{-# LANGUAGE PatternGuards #-}
2+{-# LANGUAGE CPP #-}
23module Stackage.Select
34 ( select
45 , defaultSelectSettings
@@ -27,6 +28,11 @@ defaultSelectSettings = SelectSettings
2728 , excludedPackages = empty
2829 , flags = \coreMap ->
2930 Set.fromList (words "blaze_html_0_5") `Set.union`
31+
32+#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
33+ -- Needed on Windows to get unix-compat to compile
34+ Set.fromList (words "old-time") `Set.union`
35+#endif
3036 -- Support for containers-unicode-symbols
3137 (case Map.lookup (PackageName "containers") coreMap of
3238 Just v | Just range <- simpleParse "< 0.5", v `withinRange` range