Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
cf3a3f9a
Unverified
Commit
cf3a3f9a
authored
Jan 18, 2017
by
Mikhail Glushenkov
Committed by
Mikhail Glushenkov
Jan 19, 2017
Browse files
Formatting.
parent
d377264f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Cabal/Distribution/Simple/Setup.hs
View file @
cf3a3f9a
...
...
@@ -310,8 +310,8 @@ instance Binary AllowNewer
instance
Binary
AllowOlder
instance
Semigroup
RelaxDeps
where
RelaxDepsNone
<>
r
=
r
l
@
RelaxDepsAll
<>
_
=
l
RelaxDepsNone
<>
r
=
r
l
@
RelaxDepsAll
<>
_
=
l
l
@
(
RelaxDepsSome
_
)
<>
RelaxDepsNone
=
l
(
RelaxDepsSome
_
)
<>
r
@
RelaxDepsAll
=
r
(
RelaxDepsSome
a
)
<>
(
RelaxDepsSome
b
)
=
RelaxDepsSome
(
a
++
b
)
...
...
@@ -345,7 +345,7 @@ relaxDepsParser =
(
Just
.
RelaxDepsSome
)
`
fmap
`
Parse
.
sepBy1
parse
(
Parse
.
char
','
)
relaxDepsPrinter
::
(
Maybe
RelaxDeps
)
->
[
Maybe
String
]
relaxDepsPrinter
Nothing
=
[]
relaxDepsPrinter
Nothing
=
[]
relaxDepsPrinter
(
Just
RelaxDepsNone
)
=
[]
relaxDepsPrinter
(
Just
RelaxDepsAll
)
=
[
Nothing
]
relaxDepsPrinter
(
Just
(
RelaxDepsSome
pkgs
))
=
map
(
Just
.
display
)
$
pkgs
...
...
cabal-install/Distribution/Client/Outdated.hs
View file @
cf3a3f9a
...
...
@@ -111,8 +111,8 @@ depsFromFreezeFile verbosity = do
depsFromNewFreezeFile
::
Verbosity
->
IO
[
Dependency
]
depsFromNewFreezeFile
verbosity
=
do
projectRootDir
<-
findProjectRoot
{- TODO: Support '--project-file' -}
mempty
projectConfig
<-
runRebuild
projectRootDir
$
readProjectLocalFreezeConfig
verbosity
mempty
projectRootDir
projectConfig
<-
runRebuild
projectRootDir
$
readProjectLocalFreezeConfig
verbosity
mempty
projectRootDir
let
ucnstrs
=
map
fst
.
projectConfigConstraints
.
projectConfigShared
$
projectConfig
deps
=
userConstraintsToDependencies
ucnstrs
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment