Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
Cabal
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Glasgow Haskell Compiler
Packages
Cabal
Commits
e6a88ea5
Commit
e6a88ea5
authored
9 years ago
by
Edsko de Vries
Browse files
Options
Downloads
Patches
Plain Diff
Add setup dependenices to modular solver's input
(and, therefore, also to the modular solver's output)
parent
1cfec90b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cabal-install/Distribution/Client/Dependency/Modular/IndexConversion.hs
+7
-1
7 additions, 1 deletion
...Distribution/Client/Dependency/Modular/IndexConversion.hs
with
7 additions
and
1 deletion
cabal-install/Distribution/Client/Dependency/Modular/IndexConversion.hs
+
7
−
1
View file @
e6a88ea5
...
...
@@ -114,13 +114,14 @@ convSP os arch cinfo strfl (SourcePackage (PackageIdentifier pn pv) gpd _ _pl) =
convGPD
::
OS
->
Arch
->
CompilerInfo
->
Bool
->
PI
PN
->
GenericPackageDescription
->
PInfo
convGPD
os
arch
comp
strfl
pi
(
GenericPackageDescription
_
flags
libs
exes
tests
benchs
)
=
(
GenericPackageDescription
pkg
flags
libs
exes
tests
benchs
)
=
let
fds
=
flagInfo
strfl
flags
conv
=
convCondTree
os
arch
comp
pi
fds
(
const
True
)
in
PInfo
(
maybe
[]
(
conv
ComponentLib
)
libs
++
maybe
[]
(
convSetupBuildInfo
pi
)
(
setupBuildInfo
pkg
)
++
concatMap
(
\
(
nm
,
ds
)
->
conv
(
ComponentExe
nm
)
ds
)
exes
++
prefix
(
Stanza
(
SN
pi
TestStanzas
))
(
L
.
map
(
\
(
nm
,
ds
)
->
conv
(
ComponentTest
nm
)
ds
)
tests
)
++
...
...
@@ -211,3 +212,8 @@ convDep pn' (Dependency pn vr) = Dep pn (Constrained [(vr, Goal (P pn') [])])
-- | Convert a Cabal package identifier to a solver-specific dependency.
convPI
::
PN
->
PackageIdentifier
->
Dep
PN
convPI
pn'
(
PackageIdentifier
pn
v
)
=
Dep
pn
(
Constrained
[(
eqVR
v
,
Goal
(
P
pn'
)
[]
)])
-- | Convert setup dependencies
convSetupBuildInfo
::
PI
PN
->
SetupBuildInfo
->
FlaggedDeps
Component
PN
convSetupBuildInfo
(
PI
pn
_i
)
nfo
=
L
.
map
(
\
d
->
D
.
Simple
(
convDep
pn
d
)
ComponentSetup
)
(
PD
.
setupDepends
nfo
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment