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
e7dfd6d7
Unverified
Commit
e7dfd6d7
authored
Apr 25, 2020
by
Julian Ospald
🍵
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change 'optional-packages' default on missing cabal.project
Fixes #6739
parent
b89a1c63
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
Cabal/doc/cabal-project.rst
Cabal/doc/cabal-project.rst
+5
-4
cabal-install/Distribution/Client/ProjectConfig.hs
cabal-install/Distribution/Client/ProjectConfig.hs
+0
-3
changelog.d/issue-6739
changelog.d/issue-6739
+3
-0
No files found.
Cabal/doc/cabal-project.rst
View file @
e7dfd6d7
...
...
@@ -67,7 +67,7 @@ project are:
..
cfg
-
field
::
optional
-
packages
:
package
location
list
(
space
or
comma
-
separated
)
:
synopsis
:
Optional
project
packages
.
:
default
:
``./*/*.
cabal
``
:
default
:
empty
Like
:
cfg
-
field
:`
packages
`,
specifies
a
list
of
package
locations
containing
local
packages
to
be
built
.
Unlike
:
cfg
-
field
:`
packages
`,
...
...
@@ -90,13 +90,14 @@ project are:
All local packages are *vendored*, in the sense that if other packages
(including external ones from Hackage) depend on a package with the name
of a local package, the local package is preferentially used. This
motivates the default settings::
of a local package, the local package is preferentially used.
For subdirectories to be considered local packages, the following setting
can be used::
packages: ./*.cabal
optional-packages: ./*/*.cabal
...any package can be vendored simply by making a checkout in the
...
then
any package can be vendored simply by making a checkout in the
top-level project directory, as might be seen in this hypothetical
directory layout::
...
...
cabal-install/Distribution/Client/ProjectConfig.hs
View file @
e7dfd6d7
...
...
@@ -544,9 +544,6 @@ readProjectLocalConfigOrDefault verbosity distDirLayout = do
-- We expect a package in the current directory.
projectPackages
=
[
"./*.cabal"
],
-- This is to automatically pick up deps that we unpack locally.
projectPackagesOptional
=
[
"./*/*.cabal"
],
projectConfigProvenance
=
Set
.
singleton
Implicit
}
...
...
changelog.d/issue-6739
0 → 100644
View file @
e7dfd6d7
synopsis: Change 'optional-packages' default to empty, when cabal.project is mising.
issues: #6739
prs: #6740
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