Merge pull request #337 from diogob/changes_stack_resolver

Changes stack resolver to nightly.
This commit is contained in:
Joe Nelson
2015-11-01 15:15:11 -08:00
3 changed files with 4 additions and 8 deletions
+1 -1
View File
@@ -50,7 +50,7 @@ claimsToSQL = map setVar . toList
In case there is any problem decoding the JWT it returns Nothing. In case there is any problem decoding the JWT it returns Nothing.
-} -}
jwtClaims :: Text -> Text -> Maybe JWT.ClaimsMap jwtClaims :: Text -> Text -> Maybe JWT.ClaimsMap
jwtClaims secret input = JWT.unregisteredClaims <$> JWT.claims <$> decoded jwtClaims secret input = JWT.unregisteredClaims . JWT.claims <$> decoded
where where
decoded = JWT.decodeAndVerifySignature (JWT.secret secret) input decoded = JWT.decodeAndVerifySignature (JWT.secret secret) input
+1 -1
View File
@@ -172,7 +172,7 @@ allRelations = do
) )
|] |]
let simpleRelations = foldr (addParentRelation.relationFromRow) [] rels let simpleRelations = foldr (addParentRelation.relationFromRow) [] rels
links = join $ map (combinations 2) $ filter ((>=1).length) $ groupWith groupFn $ filter ( (==Child). relType) simpleRelations links = join $ map (combinations 2) $ filter (not . null) $ groupWith groupFn $ filter ( (==Child). relType) simpleRelations
return $ simpleRelations ++ mapMaybe link2Relation links return $ simpleRelations ++ mapMaybe link2Relation links
where where
groupFn :: Relation -> Text groupFn :: Relation -> Text
+2 -6
View File
@@ -1,11 +1,7 @@
flags: {} flags: {}
packages: packages:
- '.' - '.'
extra-deps: extra-deps:
- Ranged-sets-0.3.0 - Ranged-sets-0.3.0
- packdeps-0.4.1 - packdeps-0.4.1
- hspec-2.2.0 resolver: nightly-2015-10-27
- hspec-core-2.2.0
- hspec-discover-2.2.0
- hspec-expectations-0.7.2
resolver: lts-3.10