Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
1053834a
Commit
1053834a
authored
Apr 24, 2016
by
kristenk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move BooleanFlag from D.C.Types to D.S.Setup
parent
dfd8a46e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
12 deletions
+15
-12
Cabal/Distribution/Simple/Setup.hs
Cabal/Distribution/Simple/Setup.hs
+8
-0
cabal-install/Distribution/Client/Dependency/Modular/Solver.hs
...-install/Distribution/Client/Dependency/Modular/Solver.hs
+2
-1
cabal-install/Distribution/Client/Dependency/Types.hs
cabal-install/Distribution/Client/Dependency/Types.hs
+2
-2
cabal-install/Distribution/Client/Setup.hs
cabal-install/Distribution/Client/Setup.hs
+3
-2
cabal-install/Distribution/Client/Types.hs
cabal-install/Distribution/Client/Types.hs
+0
-7
No files found.
Cabal/Distribution/Simple/Setup.hs
View file @
1053834a
...
...
@@ -66,6 +66,7 @@ module Distribution.Simple.Setup (
fromFlagOrDefault
,
flagToMaybe
,
flagToList
,
BooleanFlag
(
..
),
boolOpt
,
boolOpt'
,
trueArg
,
falseArg
,
optionVerbosity
,
optionNumJobs
,
readPToMaybe
)
where
...
...
@@ -175,6 +176,13 @@ allFlags flags = if all (\f -> fromFlagOrDefault False f) flags
then
Flag
True
else
NoFlag
-- | Types that represent boolean flags.
class
BooleanFlag
a
where
asBool
::
a
->
Bool
instance
BooleanFlag
Bool
where
asBool
=
id
-- ------------------------------------------------------------
-- * Global flags
-- ------------------------------------------------------------
...
...
cabal-install/Distribution/Client/Dependency/Modular/Solver.hs
View file @
1053834a
...
...
@@ -23,7 +23,8 @@ import Distribution.Client.Dependency.Modular.Package
import
qualified
Distribution.Client.Dependency.Modular.Preference
as
P
import
Distribution.Client.Dependency.Modular.Validate
import
Distribution.Client.Dependency.Modular.Linking
import
Distribution.Client.Types
(
BooleanFlag
(
..
))
import
Distribution.Simple.Setup
(
BooleanFlag
(
..
))
-- | Various options for the modular solver.
data
SolverConfig
=
SolverConfig
{
...
...
cabal-install/Distribution/Client/Dependency/Types.hs
View file @
1053834a
...
...
@@ -61,8 +61,7 @@ import Data.Monoid
import
Distribution.Client.PkgConfigDb
(
PkgConfigDb
)
import
Distribution.Client.Types
(
BooleanFlag
(
..
),
OptionalStanza
(
..
),
SourcePackage
(
..
)
,
SolverPackage
)
(
OptionalStanza
(
..
),
SourcePackage
(
..
),
SolverPackage
)
import
qualified
Distribution.Compat.ReadP
as
Parse
(
pfail
,
munch1
)
...
...
@@ -73,6 +72,7 @@ import Distribution.InstalledPackageInfo
import
qualified
Distribution.Client.PackageIndex
as
PackageIndex
(
PackageIndex
)
import
Distribution.Simple.PackageIndex
(
InstalledPackageIndex
)
import
Distribution.Simple.Setup
(
BooleanFlag
(
..
)
)
import
Distribution.Package
(
PackageName
)
import
Distribution.Version
...
...
cabal-install/Distribution/Client/Setup.hs
View file @
1053834a
...
...
@@ -55,7 +55,7 @@ module Distribution.Client.Setup
)
where
import
Distribution.Client.Types
(
BooleanFlag
(
..
),
Username
(
..
),
Password
(
..
),
RemoteRepo
(
..
)
)
(
Username
(
..
),
Password
(
..
),
RemoteRepo
(
..
)
)
import
Distribution.Client.BuildReports.Types
(
ReportLevel
(
..
)
)
import
Distribution.Client.Dependency.Types
...
...
@@ -82,7 +82,8 @@ import Distribution.Simple.Setup
,
SDistFlags
(
..
),
HaddockFlags
(
..
)
,
readPackageDbList
,
showPackageDbList
,
Flag
(
..
),
toFlag
,
flagToMaybe
,
flagToList
,
optionVerbosity
,
boolOpt
,
boolOpt'
,
trueArg
,
falseArg
,
BooleanFlag
(
..
),
optionVerbosity
,
boolOpt
,
boolOpt'
,
trueArg
,
falseArg
,
readPToMaybe
,
optionNumJobs
)
import
Distribution.Simple.InstallDirs
(
PathTemplate
,
InstallDirs
(
sysconfdir
)
...
...
cabal-install/Distribution/Client/Types.hs
View file @
1053834a
...
...
@@ -51,13 +51,6 @@ import Distribution.Compat.Binary (Binary(..))
newtype
Username
=
Username
{
unUsername
::
String
}
newtype
Password
=
Password
{
unPassword
::
String
}
-- | Types that represent boolean flags.
class
BooleanFlag
a
where
asBool
::
a
->
Bool
instance
BooleanFlag
Bool
where
asBool
=
id
-- | This is the information we get from a @00-index.tar.gz@ hackage index.
--
data
SourcePackageDb
=
SourcePackageDb
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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