diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2017-09-20 15:16:24 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2017-09-20 15:31:50 +0200 |
| commit | 02ff70563e490d2a7f3141eab7229803c523da57 (patch) | |
| tree | 339c80a390d95e7688ddc7df9987f436000e9d0f | |
| parent | 11d9615e9f751d6ed084f1cb20c24ad6b408230e (diff) | |
| download | haskell-02ff70563e490d2a7f3141eab7229803c523da57.tar.gz | |
Add 'stm' package to the global package database
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.
| -rw-r--r-- | ghc.mk | 1 | ||||
| m--------- | libraries/stm | 0 | ||||
| -rw-r--r-- | packages | 2 |
3 files changed, 2 insertions, 1 deletions
@@ -470,6 +470,7 @@ else libraries/haskeline_CONFIGURE_OPTS += --flags=-terminfo endif +PACKAGES_STAGE1 += stm PACKAGES_STAGE1 += haskeline PACKAGES_STAGE1 += ghci diff --git a/libraries/stm b/libraries/stm -Subproject b6e863e517bdcc3c5de1fbcb776a3fd7e6fe210 +Subproject d65fd4de49635a1e53405fe6699b46363a9d134 @@ -65,7 +65,7 @@ libraries/Win32 - - https:/ libraries/xhtml - - https://github.com/haskell/xhtml.git nofib nofib - - libraries/parallel extra - ssh://git@github.com/haskell/parallel.git -libraries/stm extra - - +libraries/stm - - ssh://git@github.com/haskell/stm.git libraries/random extra - https://github.com/haskell/random.git libraries/primitive dph - https://github.com/haskell/primitive.git libraries/vector dph - https://github.com/haskell/vector.git |