Skip to content
GitLab
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
3ece1013
Commit
3ece1013
authored
Oct 13, 2016
by
bardur.arantsson
Committed by
GitHub
Oct 13, 2016
Browse files
Merge pull request #3977 from ezyang/backpack
Rename 'backpack-includes' to 'mixins'.
parents
c7a9c6b8
6db54860
Changes
11
Hide whitespace changes
Inline
Side-by-side
Cabal/Distribution/PackageDescription/Check.hs
View file @
3ece1013
...
...
@@ -1009,7 +1009,7 @@ checkCabalVersion pkg =
-- check use of thinning and renaming
,
checkVersion
[
1
,
25
]
usesBackpackIncludes
$
PackageDistInexcusable
$
"To use the '
backpack-include
s' field the package needs to specify "
"To use the '
mixin
s' field the package needs to specify "
++
"at least 'cabal-version: >= 1.25'."
-- check use of 'extra-framework-dirs' field
...
...
Cabal/Distribution/PackageDescription/Parse.hs
View file @
3ece1013
...
...
@@ -393,7 +393,7 @@ binfoFieldDescrs =
,
commaListFieldWithSep
vcat
"build-depends"
disp
parse
targetBuildDepends
(
\
xs
binfo
->
binfo
{
targetBuildDepends
=
xs
})
,
commaListFieldWithSep
vcat
"
backpack-include
s"
,
commaListFieldWithSep
vcat
"
mixin
s"
showBackpackInclude
parseBackpackInclude
backpackIncludes
(
\
xs
binfo
->
binfo
{
backpackIncludes
=
xs
})
,
spaceListField
"cpp-options"
...
...
Cabal/changelog
View file @
3ece1013
...
...
@@ -127,7 +127,7 @@
* Macros '
VERSION_
$
pkgname
' and '
MIN_VERSION_
$
pkgname
' are now
also generated for the current package. (#3235).
* Backpack is supported! Two new fields supported in Cabal
files: signatures and
backpack-include
s; and a new flag
files: signatures and
mixin
s; and a new flag
to setup scripts, '
--
instantiate
-
with
'. See
https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst
for more details.
...
...
Cabal/tests/PackageTests/Backpack/Includes1/Includes1.cabal
View file @
3ece1013
...
...
@@ -9,5 +9,5 @@ cabal-version: >=1.25
library
build-depends: base, containers
exposed-modules: A B
backpack-include
s: containers (Data.Map)
mixin
s: containers (Data.Map)
default-language: Haskell2010
Cabal/tests/PackageTests/Backpack/Includes2/Includes2.cabal
View file @
3ece1013
...
...
@@ -27,7 +27,7 @@ library postgresql
library
build-depends: base, mysql, postgresql, mylib
backpack-include
s:
mixin
s:
mylib (Mine as Mine.MySQL) requires (Database as Database.MySQL),
mylib (Mine as Mine.PostgreSQL) requires (Database as Database.PostgreSQL)
exposed-modules: App
...
...
Cabal/tests/PackageTests/Backpack/Includes2/fail.cabal
View file @
3ece1013
...
...
@@ -27,7 +27,7 @@ library postgresql
library
build-depends: base, mysql, postgresql, mylib
backpack-include
s:
mixin
s:
mysql (Database.MySQL as Database),
postgresql (Database.PostgreSQL as Database)
exposed-modules: App
...
...
Cabal/tests/PackageTests/Backpack/Includes2/src/src.cabal
View file @
3ece1013
...
...
@@ -8,7 +8,7 @@ cabal-version: >=1.25
library
build-depends: base, mysql, postgresql, mylib
backpack-include
s:
mixin
s:
mylib (Mine as Mine.MySQL) requires (Database as Database.MySQL),
mylib (Mine as Mine.PostgreSQL) requires (Database as Database.PostgreSQL)
exposed-modules: App
...
...
Cabal/tests/PackageTests/Backpack/Includes5/Includes5.cabal
View file @
3ece1013
...
...
@@ -14,12 +14,12 @@ library impl
library good
build-depends: base, impl
backpack-include
s: impl hiding (Foobar)
mixin
s: impl hiding (Foobar)
exposed-modules: A
default-language: Haskell2010
library bad
build-depends: base, impl, good
backpack-include
s: impl hiding (Foobar)
mixin
s: impl hiding (Foobar)
exposed-modules: B
default-language: Haskell2010
Cabal/tests/PackageTests/Backpack/Reexport1/p/p.cabal
View file @
3ece1013
...
...
@@ -7,7 +7,7 @@ build-type: Simple
cabal-version: >=1.25
library
backpack-include
s: containers (Data.Map as Map)
mixin
s: containers (Data.Map as Map)
exposed-modules: P
reexported-modules: Map
build-depends: base, containers
...
...
cabal-install/tests/IntegrationTests/backpack/includes2/Includes2.cabal
View file @
3ece1013
...
...
@@ -27,7 +27,7 @@ library postgresql
library
build-depends: base, mysql, postgresql, mylib
backpack-include
s:
mixin
s:
mylib (Mine as Mine.MySQL) requires (Database as Database.MySQL),
mylib (Mine as Mine.PostgreSQL) requires (Database as Database.PostgreSQL)
exposed-modules: App
...
...
cabal-install/tests/IntegrationTests/backpack/includes2/src/src.cabal
View file @
3ece1013
...
...
@@ -8,7 +8,7 @@ cabal-version: >=1.25
library
build-depends: base, mysql, postgresql, mylib
backpack-include
s:
mixin
s:
mylib (Mine as Mine.MySQL) requires (Database as Database.MySQL),
mylib (Mine as Mine.PostgreSQL) requires (Database as Database.PostgreSQL)
exposed-modules: App
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment