diff --git a/src/Stack/Dot.hs b/src/Stack/Dot.hs index a49b6dab47..3c44b5a1ed 100644 --- a/src/Stack/Dot.hs +++ b/src/Stack/Dot.hs @@ -147,7 +147,7 @@ createDependencyGraph dotOpts = do | name `elem` [mkPackageName "rts", mkPackageName "ghc"] = return (Set.empty, DotPayload (Just version) (Just $ Right BSD3) Nothing) | otherwise = - fmap (packageAllDeps &&& (makePayload loc)) (loadPackage loc flags ghcOptions cabalConfigOpts) + fmap (packageAllDeps &&& makePayload loc) (loadPackage loc flags ghcOptions cabalConfigOpts) resolveDependencies (dotDependencyDepth dotOpts) graph depLoader where makePayload loc pkg = DotPayload (Just $ packageVersion pkg) (Just $ packageLicense pkg) (Just $ PLImmutable loc) @@ -177,7 +177,7 @@ dependencyToJSON pkg (_, payload) = let fieldsAlwaysPresent = [ "name" .= packa , "license" .= licenseText payload , "version" .= versionText payload ] - loc = catMaybes [("location" .=) <$> pkgLocToJSON <$> payloadLocation payload] + loc = catMaybes [("location" .=) . pkgLocToJSON <$> payloadLocation payload] in object $ fieldsAlwaysPresent ++ loc pkgLocToJSON :: PackageLocation -> Value diff --git a/src/test/Stack/DotSpec.hs b/src/test/Stack/DotSpec.hs index bebf76478b..4af94c2bb0 100644 --- a/src/test/Stack/DotSpec.hs +++ b/src/test/Stack/DotSpec.hs @@ -19,7 +19,7 @@ import Test.QuickCheck (forAll,choose,Gen) import Stack.Dot dummyPayload :: DotPayload -dummyPayload = DotPayload (parseVersion "0.0.0.0") (Just (Right BSD3)) +dummyPayload = DotPayload (parseVersion "0.0.0.0") (Just (Right BSD3)) Nothing spec :: Spec spec = do