| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
[skip ci]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is a preparation for `haskeline` picking up a dependency on `stm`
real soon now. See https://github.com/judah/haskeline/pull/61 for details.
If we figure out a way to not bundle the libraries depended upon by the
GHCi executable in the global package database (see #8919 for the original
reason why we had to start bundling terminfo/haskeline in the first place)
we can get rid of `stm` again...
On the bright side, we were able to avoid uploading new `stm` releases for
over two years already, so it shouldn't cause too much trouble if GHC imposes
a strong preference on the `stm` package's version (this most likely will
mostly affect Linux distributions & similiar).
While at it, this also update the stm submodule to include relaxed
bounds to allow the upcoming base-4.11 version.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
These three submodules have commits which add certain files to their
respective .gitignores which GHC's build system produces. Also update
the packages file accordingly.
Test Plan: If it builds, ship it
Reviewers: hvr, austin, bgamari
Subscribers: rwbarton, thomie
Differential Revision: https://phabricator.haskell.org/D3842
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Cabal's parser has been rewritten in terms of Parsec (which is not
enabled yet in Cabal-2.0 by default, but can be enabled by a cabal
flag). The plan for Cabal is to drop support for the non-parsec parser,
so we need to prepare GHC to cope with new situation.
However, this means that lib:Cabal requires three new library
dependency submodules,
- parsec
- text
- mtl
What complicates matters is that we need to build `ghc-cabal` early on
during the bootstrap phase which currently needs to invoke `ghc --make`
directly. So these additional dependencies need to be integrated into
the monolithic `ghc --make` invocation which produces the `ghc-cabal`
executable.
Test Plan: `./validate --fast` passed
Reviewers: austin, bgamari
Subscribers: erikd, phadej, rwbarton, thomie
Differential Revision: https://phabricator.haskell.org/D3757
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This copies the subset of Hoopl's functionality needed by GHC to
`cmm/Hoopl` and removes the dependency on the Hoopl package.
The main motivation for this change is the confusing/noisy interface
between GHC and Hoopl:
- Hoopl has `Label` which is GHC's `BlockId` but different than
GHC's `CLabel`
- Hoopl has `Unique` which is different than GHC's `Unique`
- Hoopl has `Unique{Map,Set}` which are different than GHC's
`Uniq{FM,Set}`
- GHC has its own specialized copy of `Dataflow`, so `cmm/Hoopl` is
needed just to filter the exposed functions (filter out some of the
Hoopl's and add the GHC ones)
With this change, we'll be able to simplify this significantly.
It'll also be much easier to do invasive changes (Hoopl is a public
package on Hackage with users that depend on the current behavior)
This should introduce no changes in functionality - it merely
copies the relevant code.
Signed-off-by: Michal Terepeta <michal.terepeta@gmail.com>
Test Plan: ./validate
Reviewers: austin, bgamari, simonmar
Reviewed By: bgamari, simonmar
Subscribers: simonpj, kavon, rwbarton, thomie
Differential Revision: https://phabricator.haskell.org/D3616
|
|
|
|
| |
This reverts commit 8d4bce42de7929b0dec7e7d68e66bcfc4d266322.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is rather annoying. I'd prefer to have a stable release to
use. However libffi-3.2.1 has been released November 12, 2014, and
libffi-4 is TBD. See also https://github.com/libffi/libffi/issues/296
The core reason for this change is that llvm changed the supported
assembly to unified syntax, which libffi-3.2.1 does not use, and hence
fails to compile for arm with llvm. For refence, see the following
issue: https://github.com/libffi/libffi/issues/191
Reviewers: austin, bgamari
Reviewed By: bgamari
Subscribers: rwbarton, thomie, snowleopard
Differential Revision: https://phabricator.haskell.org/D3349
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Summary:
The plan is to release a separate library, 'compact', which gives a
friendly user-facing interface. This library is just enough so that we
can make sure the functionality is working in GHC.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: validate
Reviewers: bgamari, dfeuer, austin, simonmar, hvr
Subscribers: thomie, erikd, snowleopard
Differential Revision: https://phabricator.haskell.org/D3206
|
|
|
|
|
|
|
|
|
|
| |
Reviewers: bgamari, austin
Reviewed By: bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2733
|
|
|
|
| |
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
|
|
|
|
|
| |
It will get built as part of "validate --slow". We have 11 tests that
depend on random, so this enables more tests to work.
|
| |
|
|
|
|
|
| |
Effective immediately, pushing to the `libraries/parallel` submodule
requires pushing via ssh://git@github.com/haskell/parallel.git.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Summary:
As discussed on ghc-devs@haskell.org and the trac ticket, we're removing
these packages from the 7.10 release as they no longer work correctly,
and can't easily be made to properly follow the standard as `base`
changes over time.
This does not remove the packages from the tree, only the build system.
https://www.haskell.org/pipermail/ghc-devs/2014-November/007357.html
Signed-off-by: Austin Seipp <austin@well-typed.com>
Test Plan: iiam
Reviewers: hvr, ekmett
Reviewed By: hvr, ekmett
Subscribers: thomie, carter
Differential Revision: https://phabricator.haskell.org/D510
GHC Trac Issues: #9590
|
|
|
|
|
|
|
|
| |
Effective immediately, `deepseq` is maintained officially by the
core-library-comittee. Moreover, pushing to libraries/deepseq requires
pushing to ssh://git@github.com/haskell/deepseq.git from now on.
[skip ci]
|
|
|
|
|
| |
Effective immediately, pushing to libraries/filepath requires
pushing to ssh://git@github.com/haskell/filepath.git.
|
|
|
|
|
|
|
| |
Effective immediately, pushing to libraries/{directory,process} requires
pushing to ssh://git@github.com/haskell/{directory.process}.git. This has
been done now even though there's no scripted tooling yet as the GitHub repo
was already getting issues filed.
|
|
|
|
|
|
|
|
| |
The `time` package has recently moved its primary upstream location
to https://github.com/haskell/time.
This leaves `transformers` the only package used by GHC still requiring
darcs2git mirroring machinery.
|
|
|
|
|
|
|
| |
Effective immediately, pushing to libraries/unix requires pushing to
ssh://git@github.com/haskell/unix.git. This done now even though there's
no scripted tooling yet as the GitHub repo is already receiving pull requests
(which are getting merged)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Specifically, the following sub-repos/modules are converted:
- libffi-tarballs
- libraries/array
- libraries/deepseq
- libraries/directory
- libraries/dph
- libraries/filepath
- libraries/haskell2010
- libraries/haskell98
- libraries/hoopl
- libraries/hpc
- libraries/old-locale
- libraries/old-time
- libraries/parallel
- libraries/process
- libraries/stm
- libraries/unix
- nofib
- utils/hsc2hs
N.B. ghc-tarballs is not converted as it will probably be handled
differently in the future.
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
In the future, some script will use the last column to configure
Git to redirect `push` operations to the respective primary Git
repo.
One way could be via the `pushInsteadOf` facility described in
https://ghc.haskell.org/trac/ghc/wiki/WorkingConventions/Git/Submodules
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This adapts `sync-all` and `packages` to the recently folded-in Git
repositories
- `base.git`
- `ghc-prim.git`
- `integer-gmp.git`
- `integer-simple.git`
- `template-haskell.git`
See #8545 as well as 5f54d67818ee7a74325eed130438beba96510e43 for more
details.
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
|
|
|
|
|
|
|
|
| |
This should help contribute content to
https://ghc.haskell.org/trac/ghc/wiki/WorkingConventions/Git/Submodules
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
See merge commit 66693401b98cb5aa912948af7bbd2182474f50c4
This commit also adds a check for a left-over testsuite/.git folder to sync-all
This way, the first time sync-all is called after updating to a
post-testsuite-merge (see #8545) state of ghc.git, the sync-all script
aborts with an error message if a `testsuite/.git` folder is detected and
thus forces the user to take action.
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
|
|
|
|
| |
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
|
|
|
|
|
|
|
|
|
| |
Thus GHC's in-tree version corresponds exactly to
[hackage:terminfo-0.3.2.6]. Morever, `terminfo` has moved
to GitHub as well (https://github.com/judah/terminfo) so
the upstream repo URL in `packages` is updated as well.
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
|
|
|
|
|
|
|
|
|
|
|
| |
[hackage:haskeline] has now an official GitHub repo at
https://github.com/judah/haskeline.git
Consequently, there remain only 3 repos which are Darcs hosted
(and thus still require darcs2git mirroring), namely
[hackage:time], [hackage:terminfo], and [hackage:transformers].
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
|
|
|
|
| |
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- `primitive` is updated to upstream's HEAD which is essentially
`primitive-0.5.1.0`, plus a core-lint-error workaround for #8355 and
some minor cleanups.
- `vector` is updated to upstreams `vector-0.10.9.1` release
Note: The upstream repo location has changed to GitHub,
hence the update in the `packages` file
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
|
|
|
|
|
|
|
| |
By keeping the repository url in the `packages` file scripts such as
source:ghc/sync-all can pick it up. Moreover, it's easier to
automatically validate for correctness than the
wiki:Repositories/Upstream page.
|
|
|
|
| |
This means that ghc-tarballs is only needed on Windows
|
|
|
|
| |
It's now always 'git'.
|
|
|
|
|
|
|
| |
This means that "./sync-all commit" will record in submodules first,
and then prompt you to record a patch updating the version of the
submodules last. Should make it less likely that we forget to update
the submodules' versions.
|
|
|
|
| |
Looks like I forgot to make it one in the original conversion
|
|
|
|
| |
xhtml is a submodule
|
|
|
|
|
| |
This bring the time package into line with how we handle other
packages.
|
|
|
|
| |
Leave it to 'git submodule init/update'
|
|
|
|
| |
haskeline no longer depends on it
|
|
|
|
| |
This means we no longer need mtl in a GHC tree.
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
Also, change the haddock repo URL to point at the new repo.
NOTE: After pulling, you need to
rm -r libraries/binary
rm -r utils/haddock
./sync-all get
|
|
|
|
| |
The change to the packages file format broke it
|
|
|
|
|
|
|
| |
We no longer pull directly from upstream repos, so it wasn't useful
to have it programatically available. The info, and more, is now on
http://hackage.haskell.org/trac/ghc/wiki/Commentary/Libraries#Repositorylocations
instead.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This changes the new code generator to make use of the Hoopl package
for dataflow analysis. Hoopl is a new boot package, and is maintained
in a separate upstream git repository (as usual, GHC has its own
lagging darcs mirror in http://darcs.haskell.org/packages/hoopl).
During this merge I squashed recent history into one patch. I tried
to rebase, but the history had some internal conflicts of its own
which made rebase extremely confusing, so I gave up. The history I
squashed was:
- Update new codegen to work with latest Hoopl
- Add some notes on new code gen to cmm-notes
- Enable Hoopl lag package.
- Add SPJ note to cmm-notes
- Improve GC calls on new code generator.
Work in this branch was done by:
- Milan Straka <fox@ucw.cz>
- John Dias <dias@cs.tufts.edu>
- David Terei <davidterei@gmail.com>
Edward Z. Yang <ezyang@mit.edu> merged in further changes from GHC HEAD
and fixed a few bugs.
|
| |
|