Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
C
Cabal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
4785ca90
Commit
4785ca90
authored
Nov 25, 2019
by
Brian Wignall
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typos
parent
7587a5fc
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
29 additions
and
29 deletions
+29
-29
Cabal/ChangeLog.md
Cabal/ChangeLog.md
+3
-3
Cabal/Distribution/Compat/Lens.hs
Cabal/Distribution/Compat/Lens.hs
+1
-1
Cabal/Distribution/FieldGrammar/Parsec.hs
Cabal/Distribution/FieldGrammar/Parsec.hs
+1
-1
Cabal/Distribution/Fields/Field.hs
Cabal/Distribution/Fields/Field.hs
+1
-1
Cabal/Distribution/Simple/GHC.hs
Cabal/Distribution/Simple/GHC.hs
+2
-2
Cabal/Distribution/Simple/GHCJS.hs
Cabal/Distribution/Simple/GHCJS.hs
+2
-2
Cabal/Distribution/Types/BuildInfo.hs
Cabal/Distribution/Types/BuildInfo.hs
+1
-1
Cabal/Distribution/Types/LocalBuildInfo.hs
Cabal/Distribution/Types/LocalBuildInfo.hs
+1
-1
Cabal/Distribution/Types/PkgconfigVersionRange.hs
Cabal/Distribution/Types/PkgconfigVersionRange.hs
+1
-1
Cabal/Distribution/Utils/NubList.hs
Cabal/Distribution/Utils/NubList.hs
+1
-1
Cabal/Language/Haskell/Extension.hs
Cabal/Language/Haskell/Extension.hs
+1
-1
Cabal/doc/developing-packages.rst
Cabal/doc/developing-packages.rst
+2
-2
Cabal/doc/nix-local-build.rst
Cabal/doc/nix-local-build.rst
+2
-2
cabal-install/Distribution/Client/ProjectBuilding.hs
cabal-install/Distribution/Client/ProjectBuilding.hs
+1
-1
cabal-install/Distribution/Client/ProjectConfig/Legacy.hs
cabal-install/Distribution/Client/ProjectConfig/Legacy.hs
+1
-1
cabal-install/Distribution/Solver/Modular/IndexConversion.hs
cabal-install/Distribution/Solver/Modular/IndexConversion.hs
+1
-1
cabal-install/changelog
cabal-install/changelog
+1
-1
cabal-install/tests/IntegrationTests2.hs
cabal-install/tests/IntegrationTests2.hs
+1
-1
cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs
...all/tests/UnitTests/Distribution/Solver/Modular/Solver.hs
+3
-3
cabal-testsuite/PackageTests/AutogenModules/SrcDist/setup.test.hs
...stsuite/PackageTests/AutogenModules/SrcDist/setup.test.hs
+1
-1
cabal-testsuite/PackageTests/Regression/T5309/memoized-tcm/costMatrixWrapper.h
...geTests/Regression/T5309/memoized-tcm/costMatrixWrapper.h
+1
-1
No files found.
Cabal/ChangeLog.md
View file @
4785ca90
...
...
@@ -231,7 +231,7 @@
types (#4701).
*
Support for building with Win32 version 2.6 (#4835).
*
Change
`compilerExtensions`
and
`ghcOptExtensionMap`
to contain
`Maybe Flag`
s, since a supported exten
t
ion can lack a flag (#4443).
`Maybe Flag`
s, since a supported exten
s
ion can lack a flag (#4443).
*
Pretty-printing of
`.cabal`
files is slightly different due to
parser changes. For an example, see
https://mail.haskell.org/pipermail/cabal-devel/2017-December/010414.html.
...
...
@@ -477,7 +477,7 @@
*
Support GHC 7.10.
*
Experimental support for emitting DWARF debug info.
*
Preliminary support for relocatable packages.
*
Allow cabal to be used inside cabal exec enviroments.
*
Allow cabal to be used inside cabal exec enviro
n
ments.
*
hpc: support multiple "ways" (e.g. profiling and vanilla).
*
Support GHCJS.
*
Improved command line documentation.
...
...
@@ -813,7 +813,7 @@
*
It is no longer necessary to run
`configure`
before
`clean`
or
`sdist`
*
Added support for ghc's
`-split-objs`
*
Initial support for JHC
*
Ignore extension fields in
`.cabal`
files (fields begining with "
`x-`
")
*
Ignore extension fields in
`.cabal`
files (fields begin
n
ing with "
`x-`
")
*
Some changes to command hooks API to improve consistency
*
Hugs support improvements
*
Added GeneralisedNewtypeDeriving language extension
...
...
Cabal/Distribution/Compat/Lens.hs
View file @
4785ca90
...
...
@@ -71,7 +71,7 @@ type Traversal' s a = Traversal s s a a
type
Getting
r
s
a
=
LensLike
(
Const
r
)
s
s
a
a
type
AGetter
s
a
=
LensLike
(
Const
a
)
s
s
a
a
-- this doe
ns
't exist in 'lens'
type
AGetter
s
a
=
LensLike
(
Const
a
)
s
s
a
a
-- this doe
sn
't exist in 'lens'
type
ASetter
s
t
a
b
=
LensLike
Identity
s
t
a
b
type
ALens
s
t
a
b
=
LensLike
(
Pretext
a
b
)
s
t
a
b
...
...
Cabal/Distribution/FieldGrammar/Parsec.hs
View file @
4785ca90
...
...
@@ -47,7 +47,7 @@
-- is obviously invalid specification.
--
-- We can parse 'Fields' like we parse @aeson@ objects, yet we use
-- slighly higher-level API, so we can process unspecified fields,
-- sligh
t
ly higher-level API, so we can process unspecified fields,
-- to report unknown fields and save custom @x-fields@.
--
module
Distribution.FieldGrammar.Parsec
(
...
...
Cabal/Distribution/Fields/Field.hs
View file @
4785ca90
...
...
@@ -47,7 +47,7 @@ fieldName (Section n _ _) = n
fieldAnn
::
Field
ann
->
ann
fieldAnn
=
nameAnn
.
fieldName
-- | All transitive descendan
d
s of 'Field', including itself.
-- | All transitive descendan
t
s of 'Field', including itself.
--
-- /Note:/ the resulting list is never empty.
--
...
...
Cabal/Distribution/Simple/GHC.hs
View file @
4785ca90
...
...
@@ -1051,7 +1051,7 @@ gbuildModDefFiles (GReplFLib _ flib) = foreignLibModDefFile flib
-- In case of 'Nothing', 'Distribution.ModuleName.main' can be assumed.
exeMainModuleName
::
Executable
->
Maybe
ModuleName
exeMainModuleName
Executable
{
buildInfo
=
bnfo
}
=
-- GHC honors the last occurence of a module name updated via -main-is
-- GHC honors the last occur
r
ence of a module name updated via -main-is
--
-- Moreover, -main-is when parsed left-to-right can update either
-- the "Main" module name, or the "main" function name, or both,
...
...
@@ -1465,7 +1465,7 @@ gbuild verbosity numJobs pkg_descr lbi bm clbi = do
}
ForeignLibNativeStatic
->
-- this should be caught by buildFLib
-- (and if we do implement t
ih
s, we probably don't even want to call
-- (and if we do implement t
hi
s, we probably don't even want to call
-- ghc here, but rather Ar.createArLibArchive or something)
cabalBug
"static libraries not yet implemented"
ForeignLibTypeUnknown
->
...
...
Cabal/Distribution/Simple/GHCJS.hs
View file @
4785ca90
...
...
@@ -903,7 +903,7 @@ gbuildModDefFiles (GReplFLib _ flib) = foreignLibModDefFile flib
-- In case of 'Nothing', 'Distribution.ModuleName.main' can be assumed.
exeMainModuleName
::
Executable
->
Maybe
ModuleName
exeMainModuleName
Executable
{
buildInfo
=
bnfo
}
=
-- GHC honors the last occurence of a module name updated via -main-is
-- GHC honors the last occur
r
ence of a module name updated via -main-is
--
-- Moreover, -main-is when parsed left-to-right can update either
-- the "Main" module name, or the "main" function name, or both,
...
...
@@ -1311,7 +1311,7 @@ gbuild verbosity numJobs pkg_descr lbi bm clbi = do
}
ForeignLibNativeStatic
->
-- this should be caught by buildFLib
-- (and if we do implement t
ih
s, we probably don't even want to call
-- (and if we do implement t
hi
s, we probably don't even want to call
-- ghc here, but rather Ar.createArLibArchive or something)
cabalBug
"static libraries not yet implemented"
ForeignLibTypeUnknown
->
...
...
Cabal/Distribution/Types/BuildInfo.hs
View file @
4785ca90
...
...
@@ -83,7 +83,7 @@ data BuildInfo = BuildInfo {
-- and copied and registered together with this library. The
-- logic on how this library is built will have to be encoded in a
-- custom Setup for now. Oherwise cabal would need to lear how to
-- call arbitary library builders.
-- call arbit
r
ary library builders.
extraLibFlavours
::
[
String
],
-- ^ Hidden Flag. This set of strings, will be appended to all libraries when
-- copying. E.g. [libHS<name>_<flavour> | flavour <- extraLibFlavours]. This
-- should only be needed in very specific cases, e.g. the `rts` package, where
...
...
Cabal/Distribution/Types/LocalBuildInfo.hs
View file @
4785ca90
...
...
@@ -129,7 +129,7 @@ data LocalBuildInfo = LocalBuildInfo {
-- In principle, this is supposed to contain the
-- resolved package description, that does not contain
-- any conditionals. However, it MAY NOT contain
-- the description w
ti
h a 'HookedBuildInfo' applied
-- the description w
it
h a 'HookedBuildInfo' applied
-- to it; see 'HookedBuildInfo' for the whole sordid saga.
-- As much as possible, Cabal library should avoid using
-- this parameter.
...
...
Cabal/Distribution/Types/PkgconfigVersionRange.hs
View file @
4785ca90
...
...
@@ -61,7 +61,7 @@ instance Parsec PkgconfigVersionRange where
-- note: the wildcard is used in some places, e.g
-- http://hackage.haskell.org/package/bindings-libzip-0.10.1/bindings-libzip.cabal
--
-- however, in the presen
s
e of alphanumerics etc. lax version parser,
-- however, in the presen
c
e of alphanumerics etc. lax version parser,
-- wildcard is ill-specified
parsec
=
do
...
...
Cabal/Distribution/Utils/NubList.hs
View file @
4785ca90
...
...
@@ -25,7 +25,7 @@ newtype NubList a =
deriving
(
Eq
,
Generic
,
Typeable
)
-- NubList assumes that nub retains the list order while removing duplicate
-- elements (keeping the first occurence). Documentation for "Data.List.nub"
-- elements (keeping the first occur
r
ence). Documentation for "Data.List.nub"
-- does not specifically state that ordering is maintained so we will add a test
-- for that to the test suite.
...
...
Cabal/Language/Haskell/Extension.hs
View file @
4785ca90
...
...
@@ -777,7 +777,7 @@ data KnownExtension =
-- to the type-level.
|
TypeInType
-- | Allow recursive (and therefore undecid
e
able) super-class relationships.
-- | Allow recursive (and therefore undecidable) super-class relationships.
|
UndecidableSuperClasses
-- | A temporary extension to help library authors check if their
...
...
Cabal/doc/developing-packages.rst
View file @
4785ca90
...
...
@@ -1340,7 +1340,7 @@ look something like this:
build-depends: foo-internal, base
Internal libraries are also useful for packages that define multiple
executables, but do not define a public
al
ly accessible library. Internal
executables, but do not define a publicly accessible library. Internal
libraries are only visible internally in the package (so they can only
be added to the :pkg-field:`build-depends` of same-package libraries,
executables, test suites, etc.) Internal libraries locally shadow any
...
...
@@ -2013,7 +2013,7 @@ system-dependent values for these fields.
**Library Names**
External libraries are identified by the package'
s
name
they
're
provided by (currently a package can only public
al
ly expose its
provided by (currently a package can only publicly expose its
main library compeonent; in future, packages with multiple exposed
public library components will be supported and a syntax for
referring to public sub-libraries will be provided).
...
...
Cabal/doc/nix-local-build.rst
View file @
4785ca90
...
...
@@ -969,7 +969,7 @@ The following settings control the behavior of the dependency solver:
.. cfg-field:: allow-newer: none, all or list of scoped package names (space or comma separated)
--allow-newer, --allow-newer=[none,all,[scope:][^]pkg]
:synopsis: Lift dependencies upper bound constaints.
:synopsis: Lift dependencies upper bound const
r
aints.
:default: ``none``
...
...
@@ -1062,7 +1062,7 @@ The following settings control the behavior of the dependency solver:
.. cfg-field:: allow-older: none, all, list of scoped package names (space or comma separated)
--allow-older, --allow-older=[none,all,[scope:][^]pkg]
:synopsis: Lift dependency lower bound constaints.
:synopsis: Lift dependency lower bound const
r
aints.
:since: 2.0
:default: ``none``
...
...
cabal-install/Distribution/Client/ProjectBuilding.hs
View file @
4785ca90
...
...
@@ -273,7 +273,7 @@ rebuildTargetsDryRun distDirLayout@DistDirLayout{..} shared =
--
-- The packages are visited in dependency order, starting with packages with no
-- dependencies. The result for each package is accumulated into a 'Map' and
-- returned as the final result. In addition, when visting a package, the
-- returned as the final result. In addition, when vis
i
ting a package, the
-- visiting function is passed the results for all the immediate package
-- dependencies. This can be used to propagate information from dependencies.
--
...
...
cabal-install/Distribution/Client/ProjectConfig/Legacy.hs
View file @
4785ca90
...
...
@@ -1421,7 +1421,7 @@ remoteRepoSectionDescr =
--
-- | Parser combinator for simple fields which uses the field type's
-- 'Monoid' instance for combining multiple occurences of the field.
-- 'Monoid' instance for combining multiple occur
r
ences of the field.
monoidField
::
Monoid
a
=>
String
->
(
a
->
Doc
)
->
ReadP
a
a
->
(
b
->
a
)
->
(
a
->
b
->
b
)
->
FieldDescr
b
monoidField
name
showF
readF
get'
set
=
...
...
cabal-install/Distribution/Solver/Modular/IndexConversion.hs
View file @
4785ca90
...
...
@@ -341,7 +341,7 @@ filterIPNs ipns d@(Dependency pn _ _)
-- | Convert condition trees to flagged dependencies. Mutually
-- recursive with 'convBranch'. See 'convBranch' for an explanation
-- of all arguments prece
e
ding the input 'CondTree'.
-- of all arguments preceding the input 'CondTree'.
convCondTree
::
Map
FlagName
Bool
->
DependencyReason
PN
->
PackageDescription
->
OS
->
Arch
->
CompilerInfo
->
PN
->
FlagInfo
->
Component
->
(
a
->
BuildInfo
)
->
...
...
cabal-install/changelog
View file @
4785ca90
...
...
@@ -509,7 +509,7 @@
0.6.2
Duncan
Coutts
<
duncan
@
haskell
.
org
>
Feb
2009
*
The
upgrade
command
has
been
disabled
in
this
release
*
The
configure
and
install
commands
now
have
consistent
behaviour
*
Reduce
the
tend
a
ncy
to
re
-
install
already
existing
packages
*
Reduce
the
tend
e
ncy
to
re
-
install
already
existing
packages
*
The
--
constraint
=
flag
now
works
for
the
install
command
*
New
--
preference
=
flag
for
soft
constraints
/
version
preferences
*
Improved
bootstrap
.
sh
script
,
smarter
and
better
error
checking
...
...
cabal-install/tests/IntegrationTests2.hs
View file @
4785ca90
...
...
@@ -1410,7 +1410,7 @@ testBuildKeepGoing config = do
expectBuildFailed
failure1
_
<-
expectPackageConfigured
plan1
res1
"q-0.1"
-- With keep-going then we should go on to sucessfully build Q
-- With keep-going then we should go on to suc
c
essfully build Q
(
plan2
,
res2
)
<-
executePlan
=<<
planProject
testdir
(
config
`
mappend
`
keepGoing
True
)
(
_
,
failure2
)
<-
expectPackageFailed
plan2
res2
"p-0.1"
...
...
cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs
View file @
4785ca90
...
...
@@ -478,7 +478,7 @@ db1 =
]
-- In this example, we _can_ install C and D as independent goals, but we have
-- to pick two diferent versions for B (arbitrarily)
-- to pick two dif
f
erent versions for B (arbitrarily)
db2
::
ExampleDb
db2
=
[
Right
$
exAv
"A"
1
[]
...
...
@@ -874,7 +874,7 @@ db14 = [
-- has a setup dependency on D, and D has a regular dependency on C-*. However,
-- version C-1.0 is already available (perhaps it didn't have this setup dep).
-- Thus, we should be able to break this cycle even if we are installing package
-- E, which explictly depends on C-2.0.
-- E, which explic
i
tly depends on C-2.0.
db15
::
ExampleDb
db15
=
[
-- First example (real cycle, no solution)
...
...
@@ -1211,7 +1211,7 @@ testIndepGoals4 name =
-- | Test the trace messages that we get when a package refers to an unknown pkg
--
-- TODO: Currently we don't actually test the trace messages, and this particular
-- test still suceeds. The trace can only be verified by hand.
-- test still suc
c
eeds. The trace can only be verified by hand.
db21
::
ExampleDb
db21
=
[
Right
$
exAv
"A"
1
[
ExAny
"B"
]
...
...
cabal-testsuite/PackageTests/AutogenModules/SrcDist/setup.test.hs
View file @
4785ca90
...
...
@@ -13,7 +13,7 @@ main = setupAndCabalTest $ do
-- Calling sdist without running configure first makes test fail with:
-- "Exception: Run the 'configure' command first."
-- This is bec
ua
se we are calling getPersistBuildConfig
-- This is bec
au
se we are calling getPersistBuildConfig
configureResult
<-
setup'
"configure"
[]
sdistResult
<-
setup'
"sdist"
[]
...
...
cabal-testsuite/PackageTests/Regression/T5309/memoized-tcm/costMatrixWrapper.h
View file @
4785ca90
...
...
@@ -5,7 +5,7 @@
#include "dynamicCharacterOperations.h"
/** Initialize a matrix (fill in all values for non-ambiguous chracter transition costs) using a TCM sent in from an outside source. */
/** Initialize a matrix (fill in all values for non-ambiguous ch
a
racter transition costs) using a TCM sent in from an outside source. */
costMatrix_p
matrixInit
(
size_t
alphSize
,
int
*
tcm
);
/** C wrapper for cpp destructor */
...
...
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