Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (912cbfb89bc6986252cffcd229ead5f086b3af1f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (912cbfb89bc6986252cffcd229ead5f086b3af1f)
  • Date: Sun, 16 Sep 2018 09:49:07 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

devel/ghc/DEPENDS | 2
+-
devel/ghc/HISTORY | 3
+++
devel/ghc/PRE_BUILD | 2
+-
haskell/POST_REMOVE | 2
++
haskell/haskell-hashable/DEPENDS | 3
+--
haskell/haskell-hashable/HISTORY | 3
+++
haskell/haskell-semigroups/DEPENDS | 1
-
haskell/haskell-semigroups/HISTORY | 3
+++
haskell/haskell-setlocale/HISTORY | 3
+++
haskell/haskell-setlocale/PRE_BUILD | 2
+-
haskell/haskell-tagged/0001-allow-template-haskell-version-2.12.patch | 2
+-
haskell/haskell-tagged/HISTORY | 3
+++
haskell/haskell-unordered-containers/DEPENDS | 3
+--
haskell/haskell-unordered-containers/HISTORY | 4
++++
haskell/haskell-unordered-containers/PRE_BUILD | 3
+++
15 files changed, 30 insertions(+), 9 deletions(-)

New commits:
commit 912cbfb89bc6986252cffcd229ead5f086b3af1f
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

haskell/POST_REMOVE: added parsec and text in checks, ghc provides them
now

commit dc90edfdee90b9602e79371f2b40363a3d9d7719
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

haskell/haskell-tagged: adapted to ghc 8.4.3

commit 03371633d110a972302b2dd5979b8907e14d19e1
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

haskell/haskell-setlocale: adapted to ghc 8.4.3

commit 8d4a97f252a1169bbe5bb23ced2be193ad2e4a56
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

haskell/haskell-semigroups: adapted to ghc 8.4.3

commit d179a8823942a830a4f5181086284d0384a7ed47
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

haskell/haskell-hashable: adapted to ghc 8.4.3

commit 16b85897f5e7b416dc8dd505a2215c9ef790949d
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

haskell/haskell-unordered-containers: added ghc 8.4.3 fixes

commit daed502513442251d7f5329c5caf4cbe578eec26
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

devel/ghc: python3 is required now

diff --git a/devel/ghc/DEPENDS b/devel/ghc/DEPENDS
index efa36a9..4d215a9 100755
--- a/devel/ghc/DEPENDS
+++ b/devel/ghc/DEPENDS
@@ -4,4 +4,4 @@ depends libffi '--with-system-ffi' &&
depends ncurses &&
depends numactl &&
depends perl &&
-depends python
+depends python3
diff --git a/devel/ghc/HISTORY b/devel/ghc/HISTORY
index ccb7837..8e575f2 100644
--- a/devel/ghc/HISTORY
+++ b/devel/ghc/HISTORY
@@ -1,3 +1,6 @@
+2018-09-15 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS, PRE_BUILD: python3 is required now
+
2018-06-23 Ismael Luceno <ismael AT iodev.co.uk>
* DETAILS: updated spell to 8.4.3
* PRE_BUILD, D4159.diff: remove patch, applied upstream
diff --git a/devel/ghc/PRE_BUILD b/devel/ghc/PRE_BUILD
index 4e62d69..da7425b 100755
--- a/devel/ghc/PRE_BUILD
+++ b/devel/ghc/PRE_BUILD
@@ -26,4 +26,4 @@ fi &&

cat mk/build.mk.{settings,sample} > mk/build.mk &&

-perl boot
+python3 boot
diff --git a/haskell/POST_REMOVE b/haskell/POST_REMOVE
index b5de554..e5c763e9 100755
--- a/haskell/POST_REMOVE
+++ b/haskell/POST_REMOVE
@@ -22,10 +22,12 @@ if [[ $PACKAGE != "Cabal" ]] \
&& [[ $PACKAGE != "hoopl" ]] \
&& [[ $PACKAGE != "hpc" ]] \
&& [[ $PACKAGE != "integer-gmp" ]] \
+ && [[ $PACKAGE != "parsec" ]] \
&& [[ $PACKAGE != "pretty" ]] \
&& [[ $PACKAGE != "process" ]] \
&& [[ $PACKAGE != "template-haskell" ]] \
&& [[ $PACKAGE != "terminfo" ]] \
+ && [[ $PACKAGE != "text" ]] \
&& [[ $PACKAGE != "time" ]] \
&& [[ $PACKAGE != "transformers" ]] \
&& [[ $PACKAGE != "unix" ]] \
diff --git a/haskell/haskell-hashable/DEPENDS
b/haskell/haskell-hashable/DEPENDS
index a7d8ae0..8eace53 100755
--- a/haskell/haskell-hashable/DEPENDS
+++ b/haskell/haskell-hashable/DEPENDS
@@ -1,2 +1 @@
-depends ghc &&
-depends haskell-text
+depends ghc
diff --git a/haskell/haskell-hashable/HISTORY
b/haskell/haskell-hashable/HISTORY
index 5fc2ac6..5ba2079 100644
--- a/haskell/haskell-hashable/HISTORY
+++ b/haskell/haskell-hashable/HISTORY
@@ -1,3 +1,6 @@
+2018-09-15 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: haskell-text is part of ghc now
+
2018-03-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.2.7.0

diff --git a/haskell/haskell-semigroups/DEPENDS
b/haskell/haskell-semigroups/DEPENDS
index 58e8df5..47faa4e 100755
--- a/haskell/haskell-semigroups/DEPENDS
+++ b/haskell/haskell-semigroups/DEPENDS
@@ -3,6 +3,5 @@ depends ghc &&
depends haskell-hashable &&
depends haskell-nats &&
depends haskell-tagged &&
-depends haskell-text &&
depends haskell-transformers-compat &&
depends haskell-unordered-containers
diff --git a/haskell/haskell-semigroups/HISTORY
b/haskell/haskell-semigroups/HISTORY
index 3124969..4188396 100644
--- a/haskell/haskell-semigroups/HISTORY
+++ b/haskell/haskell-semigroups/HISTORY
@@ -1,3 +1,6 @@
+2018-09-15 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: haskell-text is part of ghc now
+
2018-01-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.18.4

diff --git a/haskell/haskell-setlocale/HISTORY
b/haskell/haskell-setlocale/HISTORY
index e09130a..b7760f5 100644
--- a/haskell/haskell-setlocale/HISTORY
+++ b/haskell/haskell-setlocale/HISTORY
@@ -1,3 +1,6 @@
+2018-09-15 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD: updated the fix for ghc 8.4.3
+
2017-07-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.0.5

diff --git a/haskell/haskell-setlocale/PRE_BUILD
b/haskell/haskell-setlocale/PRE_BUILD
index a73149a..7afa061 100755
--- a/haskell/haskell-setlocale/PRE_BUILD
+++ b/haskell/haskell-setlocale/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-sed -i "/base/s;<4.9;<5.0;" setlocale.cabal
+sed -i "/base/s;<4.11;<5.0;" setlocale.cabal
diff --git
a/haskell/haskell-tagged/0001-allow-template-haskell-version-2.12.patch
b/haskell/haskell-tagged/0001-allow-template-haskell-version-2.12.patch
index 8635570..c522782 100644
--- a/haskell/haskell-tagged/0001-allow-template-haskell-version-2.12.patch
+++ b/haskell/haskell-tagged/0001-allow-template-haskell-version-2.12.patch
@@ -16,7 +16,7 @@ index 6bb6676..8eb3849 100644
if impl(ghc>=7.6)
exposed-modules: Data.Proxy.TH
- build-depends: template-haskell >= 2.8 && < 2.12
-+ build-depends: template-haskell >= 2.8 && < 2.13
++ build-depends: template-haskell >= 2.8 && < 2.14

if flag(deepseq)
build-depends: deepseq >= 1.1 && < 1.5
diff --git a/haskell/haskell-tagged/HISTORY b/haskell/haskell-tagged/HISTORY
index d2a9dcb..7aebaa9 100644
--- a/haskell/haskell-tagged/HISTORY
+++ b/haskell/haskell-tagged/HISTORY
@@ -1,3 +1,6 @@
+2018-09-15 Pavel Vinogradov <public AT sourcemage.org>
+ * 0001-allow-template-haskell-version-2.12.patch: adapted to ghc 8.4.3
+
2017-09-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: add dependency on haskell-transformers-compat

diff --git a/haskell/haskell-unordered-containers/DEPENDS
b/haskell/haskell-unordered-containers/DEPENDS
index a7d8ae0..8eace53 100755
--- a/haskell/haskell-unordered-containers/DEPENDS
+++ b/haskell/haskell-unordered-containers/DEPENDS
@@ -1,2 +1 @@
-depends ghc &&
-depends haskell-text
+depends ghc
diff --git a/haskell/haskell-unordered-containers/HISTORY
b/haskell/haskell-unordered-containers/HISTORY
index c33e1e2..5cfcc8e 100644
--- a/haskell/haskell-unordered-containers/HISTORY
+++ b/haskell/haskell-unordered-containers/HISTORY
@@ -1,3 +1,7 @@
+2018-09-15 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: haskell-text is part of ghc now
+ * PRE_BUILD: added adjustments for ghc 8.4.3
+
2017-09-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.2.8.0

diff --git a/haskell/haskell-unordered-containers/PRE_BUILD
b/haskell/haskell-unordered-containers/PRE_BUILD
new file mode 100755
index 0000000..d74ce03
--- /dev/null
+++ b/haskell/haskell-unordered-containers/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sed -i "/import Data.Semigroup/s;, Monoid(..);;" Data/HashSet.hs



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (912cbfb89bc6986252cffcd229ead5f086b3af1f), Pavel Vinogradov, 09/16/2018

Archive powered by MHonArc 2.6.24.

Top of Page