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
Haskell
Cabal
Commits
65e9b88b
Commit
65e9b88b
authored
11 years ago
by
Herbert Valerio Riedel
Browse files
Options
Downloads
Patches
Plain Diff
Add `integer-{gmp,simple}` and `template-haskell` to list of non-upgradables
This is related to #667 and similiar issues
parent
3c7a7408
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cabal-install/Distribution/Client/Dependency.hs
+2
-1
2 additions, 1 deletion
cabal-install/Distribution/Client/Dependency.hs
cabal-install/Distribution/Client/Dependency/Modular/Solver.hs
+6
-2
6 additions, 2 deletions
...-install/Distribution/Client/Dependency/Modular/Solver.hs
with
8 additions
and
3 deletions
cabal-install/Distribution/Client/Dependency.hs
+
2
−
1
View file @
65e9b88b
...
...
@@ -228,7 +228,8 @@ dontUpgradeBasePackage params =
extraConstraints
=
[
PackageConstraintInstalled
pkgname
|
all
(
/=
PackageName
"base"
)
(
depResolverTargets
params
)
,
pkgname
<-
[
PackageName
"base"
,
PackageName
"ghc-prim"
]
,
pkgname
<-
map
PackageName
[
"base"
,
"ghc-prim"
,
"integer-gmp"
,
"integer-simple"
,
"template-haskell"
]
,
isInstalled
pkgname
]
-- TODO: the top down resolver chokes on the base constraints
-- below when there are no targets and thus no dep on base.
...
...
This diff is collapsed.
Click to expand it.
cabal-install/Distribution/Client/Dependency/Modular/Solver.hs
+
6
−
2
View file @
65e9b88b
...
...
@@ -49,6 +49,10 @@ solve sc idx userPrefs userConstraints userGoals =
validateTree
idx
prunePhase
=
(
if
avoidReinstalls
sc
then
P
.
avoidReinstalls
(
const
True
)
else
id
)
.
-- packages that can never be "upgraded":
P
.
requireInstalled
(`
elem
`
[
PackageName
"base"
,
PackageName
"ghc-prim"
])
P
.
requireInstalled
(`
elem
`
[
PackageName
"base"
,
PackageName
"ghc-prim"
,
PackageName
"integer-gmp"
,
PackageName
"integer-simple"
,
PackageName
"template-haskell"
])
buildPhase
=
buildTree
idx
(
independentGoals
sc
)
userGoals
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