on master help sign in
Some initial Windows fixes
d63bab8Michael Snoyman
Stackage/Config.hs+5−1
@@ -130,8 +130,12 @@ defaultStablePackages = unPackageMap $ execWriter $ do
130 [ "asn1-data bytedump certificate cipher-aes cipher-rc4 connection"
130 [ "asn1-data bytedump certificate cipher-aes cipher-rc4 connection"
131 , "cprng-aes cpu crypto-pubkey-types crypto-random-api cryptocipher"
131 , "cprng-aes cpu crypto-pubkey-types crypto-random-api cryptocipher"
132 , "cryptohash hit language-java libgit pem siphash socks tls"
132 , "cryptohash hit language-java libgit pem siphash socks tls"
133− , "tls-debug tls-extra udbus vhd xenstore"
133+ , "tls-debug tls-extra vhd xenstore"
134 ]
134 ]
135+#if !defined(mingw32_HOST_OS) && !defined(__MINGW32__)
136+ -- Does not compile on Windows
137+ add "Vincent Hanquez" "udbus"
138+#endif
135
139
136 mapM_ (add "Edward Kmett <ekmett@gmail.com>") $ words =<<
140 mapM_ (add "Edward Kmett <ekmett@gmail.com>") $ words =<<
137 [ "ad adjunctions bifunctors bound categories charset comonad comonad-transformers"
141 [ "ad adjunctions bifunctors bound categories charset comonad comonad-transformers"
Stackage/Select.hs+6
@@ -1,4 +1,5 @@
1{-# LANGUAGE PatternGuards #-}
1{-# LANGUAGE PatternGuards #-}
2+{-# LANGUAGE CPP #-}
2module Stackage.Select
3module Stackage.Select
3 ( select
4 ( select
4 , defaultSelectSettings
5 , defaultSelectSettings
@@ -27,6 +28,11 @@ defaultSelectSettings = SelectSettings
27 , excludedPackages = empty
28 , excludedPackages = empty
28 , flags = \coreMap ->
29 , flags = \coreMap ->
29 Set.fromList (words "blaze_html_0_5") `Set.union`
30 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
30 -- Support for containers-unicode-symbols
36 -- Support for containers-unicode-symbols
31 (case Map.lookup (PackageName "containers") coreMap of
37 (case Map.lookup (PackageName "containers") coreMap of
32 Just v | Just range <- simpleParse "< 0.5", v `withinRange` range
38 Just v | Just range <- simpleParse "< 0.5", v `withinRange` range