Skip to content
GitLab
Menu
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
c092ca29
Commit
c092ca29
authored
May 31, 2009
by
Duncan Coutts
Browse files
Fix uses of deprecated stuff
parent
dfd1fc35
Changes
8
Hide whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/Configure.hs
View file @
c092ca29
...
...
@@ -60,7 +60,7 @@ import Distribution.PackageDescription.Configuration
import
Distribution.InstalledPackageInfo
(
InstalledPackageInfo
)
import
Distribution.Version
(
VersionRange
(
A
nyVersion
,
T
hisVersion
)
)
(
VersionRange
,
a
nyVersion
,
t
hisVersion
)
import
Distribution.Simple.Utils
as
Utils
(
notice
,
info
,
die
)
import
Distribution.System
...
...
@@ -109,7 +109,7 @@ configure verbosity packageDBs repos comp conf
where
setupScriptOptions
index
=
SetupScriptOptions
{
useCabalVersion
=
maybe
A
nyVersion
T
hisVersion
useCabalVersion
=
maybe
a
nyVersion
t
hisVersion
(
flagToMaybe
(
configCabalVersion
configExFlags
)),
useCompiler
=
Just
comp
,
-- Hack: we typically want to allow the UserPackageDB for finding the
...
...
@@ -153,7 +153,7 @@ planLocalPackage verbosity comp configFlags configExFlags installed
}
targets
=
[
packageName
pkg
]
constraints
=
[
PackageVersionConstraint
(
packageName
pkg
)
(
T
hisVersion
(
packageVersion
pkg
))
(
t
hisVersion
(
packageVersion
pkg
))
,
PackageFlagsConstraint
(
packageName
pkg
)
(
configConfigurationsFlags
configFlags
)]
++
[
PackageVersionConstraint
name
ver
...
...
cabal-install/Distribution/Client/Dependency/Bogus.hs
View file @
c092ca29
...
...
@@ -32,7 +32,7 @@ import Distribution.PackageDescription.Configuration
import
qualified
Distribution.Simple.PackageIndex
as
PackageIndex
import
Distribution.Simple.PackageIndex
(
PackageIndex
)
import
Distribution.Version
(
VersionRange
(
A
nyVersion
,
I
ntersectVersionRanges
)
,
withinRange
)
(
VersionRange
,
a
nyVersion
,
i
ntersectVersionRanges
,
withinRange
)
import
Distribution.Simple.Utils
(
comparing
)
import
Distribution.Text
...
...
@@ -104,11 +104,11 @@ combineConstraints :: (PackageName -> PackagePreferences)
combineConstraints
preferences
constraints
targets
=
[
(
name
,
ver
,
flags
,
pref
)
|
name
<-
targets
,
let
ver
=
fromMaybe
A
nyVersion
(
Map
.
lookup
name
versionConstraints
)
,
let
ver
=
fromMaybe
a
nyVersion
(
Map
.
lookup
name
versionConstraints
)
flags
=
fromMaybe
[]
(
Map
.
lookup
name
flagsConstraints
)
PackagePreferences
pref
_
=
preferences
name
]
where
versionConstraints
=
Map
.
fromListWith
I
ntersectVersionRanges
versionConstraints
=
Map
.
fromListWith
i
ntersectVersionRanges
[
(
name
,
versionRange
)
|
PackageVersionConstraint
name
versionRange
<-
constraints
]
...
...
cabal-install/Distribution/Client/Dependency/TopDown.hs
View file @
c092ca29
...
...
@@ -41,7 +41,7 @@ import Distribution.PackageDescription
import
Distribution.PackageDescription.Configuration
(
finalizePackageDescription
,
flattenPackageDescription
)
import
Distribution.Version
(
VersionRange
(
A
nyVersion
)
,
withinRange
)
(
VersionRange
,
a
nyVersion
,
withinRange
,
simplifyVersionRange
)
import
Distribution.Compiler
(
CompilerId
)
import
Distribution.System
...
...
@@ -585,7 +585,7 @@ addTopLevelInstalledConstraint :: PackageName
addTopLevelInstalledConstraint
pkg
constraints
=
Constraints
.
constrain
taggedDep
reason
constraints
where
dep
=
Dependency
pkg
A
nyVersion
dep
=
Dependency
pkg
a
nyVersion
taggedDep
=
TaggedDependency
InstalledConstraint
dep
reason
=
ExcludedByTopLevelDependency
dep
...
...
cabal-install/Distribution/Client/IndexUtils.hs
View file @
c092ca29
...
...
@@ -38,7 +38,7 @@ import Distribution.PackageDescription.Parse
import
Distribution.ParseUtils
(
ParseResult
(
..
)
)
import
Distribution.Version
(
VersionRange
(
I
ntersectVersionRanges
)
)
(
i
ntersectVersionRanges
)
import
Distribution.Text
(
display
,
simpleParse
)
import
Distribution.Verbosity
(
Verbosity
)
...
...
@@ -83,7 +83,7 @@ getAvailablePackages verbosity repos = do
info
verbosity
"Reading available packages..."
pkgss
<-
mapM
(
readRepoIndex
verbosity
)
repos
let
(
pkgs
,
prefs
)
=
mconcat
pkgss
prefs'
=
Map
.
fromListWith
I
ntersectVersionRanges
prefs'
=
Map
.
fromListWith
i
ntersectVersionRanges
[
(
name
,
range
)
|
Dependency
name
range
<-
prefs
]
evaluate
pkgs
evaluate
prefs'
...
...
cabal-install/Distribution/Client/Install.hs
View file @
c092ca29
...
...
@@ -103,7 +103,7 @@ import Distribution.PackageDescription.Configuration
import
Distribution.InstalledPackageInfo
(
InstalledPackageInfo
)
import
Distribution.Version
(
Version
,
VersionRange
(
A
nyVersion
,
T
hisVersion
)
)
(
Version
,
VersionRange
,
a
nyVersion
,
t
hisVersion
)
import
Distribution.Simple.Utils
as
Utils
(
notice
,
info
,
warn
,
die
,
intercalate
)
import
Distribution.Client.Utils
...
...
@@ -225,7 +225,7 @@ installWithPlanner planner verbosity packageDBs repos comp conf
where
setupScriptOptions
index
=
SetupScriptOptions
{
useCabalVersion
=
maybe
A
nyVersion
T
hisVersion
(
libVersion
miscOptions
),
useCabalVersion
=
maybe
a
nyVersion
t
hisVersion
(
libVersion
miscOptions
),
useCompiler
=
Just
comp
,
-- Hack: we typically want to allow the UserPackageDB for finding the
-- Cabal lib when compiling any Setup.hs even if we're doing a global
...
...
@@ -318,7 +318,7 @@ planLocalPackage verbosity comp configFlags configExFlags installed
}
targets
=
[
packageName
pkg
]
constraints
=
[
PackageVersionConstraint
(
packageName
pkg
)
(
T
hisVersion
(
packageVersion
pkg
))
(
t
hisVersion
(
packageVersion
pkg
))
,
PackageFlagsConstraint
(
packageName
pkg
)
(
configConfigurationsFlags
configFlags
)]
++
[
PackageVersionConstraint
name
ver
...
...
cabal-install/Distribution/Client/Setup.hs
View file @
c092ca29
...
...
@@ -46,14 +46,12 @@ import qualified Distribution.Simple.Setup as Cabal
import
Distribution.Simple.Setup
(
ConfigFlags
(
..
)
)
import
Distribution.Simple.Setup
(
Flag
(
..
),
toFlag
,
fromFlag
,
flagToList
,
flagToMaybe
,
fromFlagOrDefault
(
Flag
(
..
),
toFlag
,
fromFlag
,
flagToList
,
flagToMaybe
,
optionVerbosity
,
trueArg
)
import
Distribution.Simple.Compiler
(
PackageDB
(
..
)
)
import
Distribution.Simple.InstallDirs
(
PathTemplate
,
toPathTemplate
,
fromPathTemplate
)
import
Distribution.Version
(
Version
(
Version
),
Version
Range
(
..
)
)
(
Version
(
Version
),
any
Version
,
thisVersion
)
import
Distribution.Package
(
PackageIdentifier
,
packageName
,
packageVersion
,
Dependency
(
..
)
)
import
Distribution.Text
...
...
@@ -689,8 +687,8 @@ parseDependencyOrPackageId = parse Parse.+++ liftM pkgidToDependency parse
where
pkgidToDependency
::
PackageIdentifier
->
Dependency
pkgidToDependency
p
=
case
packageVersion
p
of
Version
[]
_
->
Dependency
(
packageName
p
)
A
nyVersion
version
->
Dependency
(
packageName
p
)
(
T
hisVersion
version
)
Version
[]
_
->
Dependency
(
packageName
p
)
a
nyVersion
version
->
Dependency
(
packageName
p
)
(
t
hisVersion
version
)
showRepo
::
RemoteRepo
->
String
showRepo
repo
=
remoteRepoName
repo
++
":"
...
...
cabal-install/Distribution/Client/SetupWrapper.hs
View file @
c092ca29
...
...
@@ -23,7 +23,8 @@ module Distribution.Client.SetupWrapper (
import
qualified
Distribution.Make
as
Make
import
qualified
Distribution.Simple
as
Simple
import
Distribution.Version
(
Version
(
..
),
VersionRange
(
..
),
withinRange
)
(
Version
(
..
),
VersionRange
,
anyVersion
,
intersectVersionRanges
,
withinRange
)
import
Distribution.Package
(
PackageIdentifier
(
..
),
PackageName
(
..
),
Package
(
..
),
packageName
,
packageVersion
,
Dependency
(
..
)
)
...
...
@@ -83,7 +84,7 @@ data SetupScriptOptions = SetupScriptOptions {
defaultSetupScriptOptions
::
SetupScriptOptions
defaultSetupScriptOptions
=
SetupScriptOptions
{
useCabalVersion
=
A
nyVersion
,
useCabalVersion
=
a
nyVersion
,
useCompiler
=
Nothing
,
usePackageDB
=
[
GlobalPackageDB
,
UserPackageDB
],
usePackageIndex
=
Nothing
,
...
...
@@ -104,7 +105,7 @@ setupWrapper verbosity options mpkg cmd flags extraArgs = do
pkg
<-
maybe
getPkg
return
mpkg
let
setupMethod
=
determineSetupMethod
options'
buildType'
options'
=
options
{
useCabalVersion
=
I
ntersectVersionRanges
useCabalVersion
=
i
ntersectVersionRanges
(
useCabalVersion
options
)
(
descCabalVersion
pkg
)
}
...
...
cabal-install/Distribution/Client/Unpack.hs
View file @
c092ca29
...
...
@@ -22,7 +22,8 @@ import Distribution.Simple.PackageIndex as PackageIndex (lookupDependency)
import
Distribution.Simple.Setup
(
fromFlag
,
fromFlagOrDefault
)
import
Distribution.Simple.Utils
(
info
,
notice
,
die
)
import
Distribution.Text
(
display
)
import
Distribution.Version
(
VersionRange
(
..
))
import
Distribution.Version
(
anyVersion
,
intersectVersionRanges
)
import
Distribution.Client.Setup
(
UnpackFlags
(
unpackVerbosity
,
unpackDestDir
))
...
...
@@ -89,8 +90,8 @@ resolvePackages (AvailablePackageDb available prefs) deps =
candidates
dep
@
(
Dependency
name
ver
)
=
let
[
x
,
y
]
=
map
(
PackageIndex
.
lookupDependency
available
)
[
Dependency
name
(
maybe
A
nyVersion
id
(
Map
.
lookup
name
prefs
)
`
I
ntersectVersionRanges
`
ver
)
(
maybe
a
nyVersion
id
(
Map
.
lookup
name
prefs
)
`
i
ntersectVersionRanges
`
ver
)
,
dep
]
in
if
null
x
then
y
else
x
best
d
[]
=
Left
d
...
...
Write
Preview
Supports
Markdown
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