git.iko.soy/stackage
on master help sign in
Remove upper bounds and close #153
commitf534e422526e0e9fe268031c06f416985d62c14c authorMichael Snoyman <michael@snoyman.com> dateThu 13 Mar 2014, 07:59 (13 years ago) parentb90f836
5 files changed+69−7
compare with master
unifiedsplit
Stackage/Config.hs−6 Stackage/LoadDatabase.hs+10−1 patching/patches/foldl-1.0.2.patch+12 patching/patches/threepenny-gui-0.4.1.0.patch+35 patching/patches/yesod-auth-oauth-1.2.0.patch+12
Stackage/Config.hs−6
@@ -323,9 +323,6 @@ defaultStablePackages ghcVer = unPackageMap $ execWriter $ do
323323 addRange "Michael Snoyman" "hxt" "< 9.3.1"
324324 addRange "Michael Snoyman" "network" "< 2.4"
325325
326− -- https://github.com/fpco/stackage/issues/153
327− addRange "Michael Snoyman" "text" "< 1.0"
328−
329326 -- https://github.com/fpco/stackage/issues/178
330327 addRange "Michael Snoyman" "MonadCatchIO-transformers" "< 0.3.1"
331328 addRange "Michael Snoyman" "MonadCatchIO-mtl" "< 0.3.1"
@@ -337,9 +334,6 @@ defaultStablePackages ghcVer = unPackageMap $ execWriter $ do
337334 addRange "Michael Snoyman" "hint" "< 0.4"
338335 addRange "Michael Snoyman" "ghc-mtl" "< 1.1"
339336
340− -- Requires aeson 0.6.*
341− addRange "Michael Snoyman" "threepenny-gui" "< 0.4.1"
342−
343337 -- local patch
344338 addRange "Michael Snoyman" "bson" "== 0.2.3"
345339
Stackage/LoadDatabase.hs+10−1
@@ -197,10 +197,19 @@ loadPackageDB settings coreMap core deps = do
197197 goBI f x = buildTools $ f $ condTreeData x
198198 depName (Dependency (PackageName pn) _) = Executable pn
199199 go gpd tree
200− = Map.unionsWith unionVersionRanges
200+ = Map.filterWithKey (\k _ -> not $ ignoredDep k)
201+ $ Map.unionsWith unionVersionRanges
201202 $ Map.fromList (map (\(Dependency pn vr) -> (pn, vr)) $ condTreeConstraints tree)
202203 : map (go gpd) (mapMaybe (checkCond gpd) $ condTreeComponents tree)
203204
205+ -- Some specific overrides for cases where getting Stackage to be smart
206+ -- enough to handle things would be too difficult.
207+ ignoredDep :: PackageName -> Bool
208+ ignoredDep dep
209+ -- The flag logic used by text-stream-decode confuses Stackage.
210+ | dep == PackageName "text" && p == PackageName "text-stream-decode" = True
211+ | otherwise = False
212+
204213 checkCond gpd (cond, tree, melse)
205214 | checkCond' cond = Just tree
206215 | otherwise = melse
patching/patches/foldl-1.0.2.patchnew file+12
@@ -0,0 +1,12 @@
1+diff -ru orig/foldl.cabal new/foldl.cabal
2+--- orig/foldl.cabal 2014-03-13 07:47:41.009928017 +0200
3++++ new/foldl.cabal 2014-03-13 07:47:40.000000000 +0200
4+@@ -24,7 +24,7 @@
5+ base >= 4 && < 5 ,
6+ bytestring >= 0.9.2.1 && < 0.11,
7+ primitive < 0.6 ,
8+- text >= 0.11.2.0 && < 1.1 ,
9++ text >= 0.11.2.0 && < 1.2 ,
10+ vector >= 0.7 && < 0.11
11+ Exposed-Modules:
12+ Control.Foldl,
patching/patches/threepenny-gui-0.4.1.0.patchnew file+35
@@ -0,0 +1,35 @@
1+diff -ru orig/src/Graphics/UI/Threepenny/Internal/Types.hs new/src/Graphics/UI/Threepenny/Internal/Types.hs
2+--- orig/src/Graphics/UI/Threepenny/Internal/Types.hs 2014-03-13 07:47:41.597928004 +0200
3++++ new/src/Graphics/UI/Threepenny/Internal/Types.hs 2014-03-13 07:47:41.000000000 +0200
4+@@ -17,6 +17,7 @@
5+ import Data.Map (Map)
6+ import Data.String (fromString)
7+ import Data.Time
8++import Data.Text.Encoding (encodeUtf8, decodeUtf8)
9+
10+ import Network.URI
11+ import Data.Data
12+@@ -62,9 +63,9 @@
13+
14+ -- Marshalling ElementId
15+ instance ToJSON ElementId where
16+- toJSON (ElementId o) = toJSON o
17++ toJSON (ElementId o) = toJSON $ decodeUtf8 o
18+ instance FromJSON ElementId where
19+- parseJSON (Object v) = ElementId <$> v .: "Element"
20++ parseJSON (Object v) = (ElementId . encodeUtf8) <$> v .: "Element"
21+ parseJSON _ = mzero
22+
23+
24+diff -ru orig/threepenny-gui.cabal new/threepenny-gui.cabal
25+--- orig/threepenny-gui.cabal 2014-03-13 07:47:41.605928005 +0200
26++++ new/threepenny-gui.cabal 2014-03-13 07:47:41.000000000 +0200
27+@@ -92,7 +92,7 @@
28+ cpp-options: -DREBUG
29+ ghc-options: -O2
30+ build-depends: base >= 4 && < 5
31+- ,aeson == 0.6.*
32++ ,aeson >= 0.6
33+ ,attoparsec-enumerator == 0.3.*
34+ ,bytestring >= 0.9.2 && < 0.11
35+ ,containers >= 0.4.2 && < 0.6
patching/patches/yesod-auth-oauth-1.2.0.patchnew file+12
@@ -0,0 +1,12 @@
1+diff -ru orig/yesod-auth-oauth.cabal new/yesod-auth-oauth.cabal
2+--- orig/yesod-auth-oauth.cabal 2014-03-13 07:47:41.773928001 +0200
3++++ new/yesod-auth-oauth.cabal 2014-03-13 07:47:41.000000000 +0200
4+@@ -24,7 +24,7 @@
5+ , bytestring >= 0.9.1.4
6+ , yesod-core >= 1.2 && < 1.3
7+ , yesod-auth >= 1.2 && < 1.3
8+- , text >= 0.7 && < 0.12
9++ , text >= 0.7 && < 1.2
10+ , yesod-form >= 1.3 && < 1.4
11+ , transformers >= 0.2.2 && < 0.4
12+ , lifted-base >= 0.2 && < 0.3