Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3c83876459c64ceece06db83a5e8399482ba1d58)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3c83876459c64ceece06db83a5e8399482ba1d58)
  • Date: Thu, 1 Nov 2018 17:43:35 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

haskell/haskell-blaze-markup/DETAILS |
4 -
haskell/haskell-blaze-markup/HISTORY |
3 +
haskell/haskell-cryptohash-md5/0001-fix-dependency-on-base.patch |
2
haskell/haskell-cryptohash-md5/HISTORY |
3 +
haskell/haskell-cryptohash-sha1/0001-fix-dependency-on-base.patch |
2
haskell/haskell-cryptohash-sha1/HISTORY |
3 +
haskell/haskell-deepseq-generics/0001-fix-dependency-on-base.patch |
2
haskell/haskell-deepseq-generics/HISTORY |
3 +
haskell/haskell-ekg-core/0001-fix-compatibility-with-ghc-8.4.patch |
5 +-
haskell/haskell-ekg-core/HISTORY |
3 +
haskell/haskell-entropy/DETAILS |
4 -
haskell/haskell-entropy/HISTORY |
3 +
haskell/haskell-exceptions/0001-fix-compatibility-with-ghc-8.6.1.patch |
25 ++++++++++
haskell/haskell-exceptions/HISTORY |
3 +
haskell/haskell-exceptions/PRE_BUILD |
5 ++
15 files changed, 61 insertions(+), 9 deletions(-)

New commits:
commit 3c83876459c64ceece06db83a5e8399482ba1d58
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-exceptions: fix compatibility with ghc 8.6.1

commit a4cdf32a9ded6bea9ff766df55547756a5d7b160
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-entropy: version 0.4.1.3

commit a87aaf58dd036638b5e251b5d294457f5dd0e822
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-ekg-core: fix compatibility with ghc 8.6.1

commit e753e2fcbf71c3e39d0431a09d35535dbdd63ca5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-deepseq-generics: fix compatibility with ghc 8.6.1

commit e0c902ff587144990e4ed9abb92f6a7e69111832
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-cryptohash-sha1: fix compatibility with ghc 8.6.1

commit dbda39c77a54ed3f3544f528074aeb282b118d83
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-blaze-markup: version 0.8.2.2

commit 3b5690448fe2d20fbc059093c6159992edb200f0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-cryptohash-md5: fix build with ghc 8.6.1

diff --git a/haskell/haskell-blaze-markup/DETAILS
b/haskell/haskell-blaze-markup/DETAILS
index ef13be1..f6355ac 100755
--- a/haskell/haskell-blaze-markup/DETAILS
+++ b/haskell/haskell-blaze-markup/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-blaze-markup
- VERSION=0.8.2.1
+ VERSION=0.8.2.2
SOURCE="blaze-markup-$VERSION.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/package/blaze-markup-$VERSION/$SOURCE
-
SOURCE_HASH=sha512:93a81076325af29e26feb3cc3a9877423571ec76cb5ce72cbf98c8c50a00ba4f6d643410ab331013604223795bd4fe83607725073d9ad9b024cedadc35cf58a5
+
SOURCE_HASH=sha512:a3f7cc69d90d25755e6e2ca0b96d1965ea40ebd8994df08df81353b9ae342ce70e80d38a85df33bd330c6d745c41cd28f2c5e8ee8fcaf08369ed26dd384dc5e6
SOURCE_DIRECTORY="$BUILD_DIRECTORY/blaze-markup-$VERSION"
WEB_SITE="http://jaspervdj.be/blaze";
LICENSE[0]="BSD3"
diff --git a/haskell/haskell-blaze-markup/HISTORY
b/haskell/haskell-blaze-markup/HISTORY
index e812b41..5d01275 100644
--- a/haskell/haskell-blaze-markup/HISTORY
+++ b/haskell/haskell-blaze-markup/HISTORY
@@ -1,3 +1,6 @@
+2018-11-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS: version 0.8.2.2
+
2018-04-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, DEPENDS: version 0.8.2.1

diff --git a/haskell/haskell-cryptohash-md5/0001-fix-dependency-on-base.patch
b/haskell/haskell-cryptohash-md5/0001-fix-dependency-on-base.patch
index 806be25..f363cdc 100644
--- a/haskell/haskell-cryptohash-md5/0001-fix-dependency-on-base.patch
+++ b/haskell/haskell-cryptohash-md5/0001-fix-dependency-on-base.patch
@@ -16,7 +16,7 @@ index 9e8eed6..7be933b 100644
library
default-language: Haskell2010
- build-depends: base >= 4.5 && < 4.10
-+ build-depends: base >= 4.5 && < 4.12
++ build-depends: base >= 4.5
, bytestring >= 0.9.2 && < 0.11

hs-source-dirs: src
diff --git a/haskell/haskell-cryptohash-md5/HISTORY
b/haskell/haskell-cryptohash-md5/HISTORY
index e2687e4..5b9aa87 100644
--- a/haskell/haskell-cryptohash-md5/HISTORY
+++ b/haskell/haskell-cryptohash-md5/HISTORY
@@ -1,3 +1,6 @@
+2018-11-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 0001-fix-dependency-on-base.patch: fix compatibility with ghc 8.6.1
+
2018-10-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* 0001-fix-dependency-on-base.patch: fix compatibility with ghc 8.4

diff --git
a/haskell/haskell-cryptohash-sha1/0001-fix-dependency-on-base.patch
b/haskell/haskell-cryptohash-sha1/0001-fix-dependency-on-base.patch
index 66083b0..a8b4c80 100644
--- a/haskell/haskell-cryptohash-sha1/0001-fix-dependency-on-base.patch
+++ b/haskell/haskell-cryptohash-sha1/0001-fix-dependency-on-base.patch
@@ -16,7 +16,7 @@ index 1f19b5b..848e315 100644
library
default-language: Haskell2010
- build-depends: base >= 4.5 && < 4.10
-+ build-depends: base >= 4.5 && < 4.12
++ build-depends: base >= 4.5
, bytestring >= 0.9.2 && < 0.11

hs-source-dirs: src
diff --git a/haskell/haskell-cryptohash-sha1/HISTORY
b/haskell/haskell-cryptohash-sha1/HISTORY
index e2687e4..5b9aa87 100644
--- a/haskell/haskell-cryptohash-sha1/HISTORY
+++ b/haskell/haskell-cryptohash-sha1/HISTORY
@@ -1,3 +1,6 @@
+2018-11-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 0001-fix-dependency-on-base.patch: fix compatibility with ghc 8.6.1
+
2018-10-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* 0001-fix-dependency-on-base.patch: fix compatibility with ghc 8.4

diff --git
a/haskell/haskell-deepseq-generics/0001-fix-dependency-on-base.patch
b/haskell/haskell-deepseq-generics/0001-fix-dependency-on-base.patch
index f4591ed..15d3b39 100644
--- a/haskell/haskell-deepseq-generics/0001-fix-dependency-on-base.patch
+++ b/haskell/haskell-deepseq-generics/0001-fix-dependency-on-base.patch
@@ -16,7 +16,7 @@ index 81744ac..3ff2d64 100644
default-language: Haskell2010
exposed-modules: Control.DeepSeq.Generics
- build-depends: base >= 4.5 && < 4.10, ghc-prim >= 0.2 && < 0.6,
deepseq >= 1.2.0.1 && < 1.5
-+ build-depends: base >= 4.5 && < 4.12, ghc-prim >= 0.2 && < 0.6,
deepseq >= 1.2.0.1 && < 1.5
++ build-depends: base >= 4.5, ghc-prim >= 0.2 && < 0.6, deepseq >=
1.2.0.1 && < 1.5
other-extensions: BangPatterns, FlexibleContexts, TypeOperators
ghc-options: -Wall

diff --git a/haskell/haskell-deepseq-generics/HISTORY
b/haskell/haskell-deepseq-generics/HISTORY
index 5f7fe07..7c35d42 100644
--- a/haskell/haskell-deepseq-generics/HISTORY
+++ b/haskell/haskell-deepseq-generics/HISTORY
@@ -1,3 +1,6 @@
+2018-11-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 0001-fix-dependency-on-base.patch: fix compatibility with ghc 8.6.1
+
2018-10-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* 0001-fix-dependency-on-base.patch: fix compatibility with ghc 8.4

diff --git
a/haskell/haskell-ekg-core/0001-fix-compatibility-with-ghc-8.4.patch
b/haskell/haskell-ekg-core/0001-fix-compatibility-with-ghc-8.4.patch
index a99bc09..cd8e987 100644
--- a/haskell/haskell-ekg-core/0001-fix-compatibility-with-ghc-8.4.patch
+++ b/haskell/haskell-ekg-core/0001-fix-compatibility-with-ghc-8.4.patch
@@ -16,8 +16,9 @@ index b157abd..b56aefc 100644
build-depends:
ghc-prim < 0.6,
- base >= 4.5 && < 4.11,
-+ base >= 4.5 && < 4.12,
- containers >= 0.5 && < 0.6,
+- containers >= 0.5 && < 0.6,
++ base >= 4.5,
++ containers >= 0.5,
text < 1.3,
unordered-containers < 0.3
--
diff --git a/haskell/haskell-ekg-core/HISTORY
b/haskell/haskell-ekg-core/HISTORY
index ddd2fbe..c1dcb51 100644
--- a/haskell/haskell-ekg-core/HISTORY
+++ b/haskell/haskell-ekg-core/HISTORY
@@ -1,3 +1,6 @@
+2018-11-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 0001-fix-compatibility-with-ghc-8.4.patch: fix compatibility with
ghc 8.6.1
+
2018-10-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, 0001-fix-compatibility-with-ghc-8.4.patch: fix
compatibility with ghc 8.4

diff --git a/haskell/haskell-entropy/DETAILS b/haskell/haskell-entropy/DETAILS
index a613f8e..726021d 100755
--- a/haskell/haskell-entropy/DETAILS
+++ b/haskell/haskell-entropy/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-entropy
- VERSION=0.4
+ VERSION=0.4.1.3
SOURCE="entropy-$VERSION.tar.gz"
SOURCE_URL[0]=https://hackage.haskell.org/package/entropy-$VERSION/$SOURCE
-
SOURCE_HASH=sha512:6c69ca86bcd1bc4519aba71be64012f6ae3529c0cdb5409929dbcca6fece646a3331ff2df6c97611f2dd5a5cd0d909bdfda61ba92e8ba25f624782f04330e298
+
SOURCE_HASH=sha512:254580816f89db7a7b92d29cf11c57a2f603600a6de4bada4fa113656fb7f3012362b562386ce83017bd3955aded63ffff4eec066080d490dcb1e812cfd191aa
SOURCE_DIRECTORY="$BUILD_DIRECTORY/entropy-$VERSION"
WEB_SITE="https://github.com/TomMD/entropy";
LICENSE[0]="BSD3"
diff --git a/haskell/haskell-entropy/HISTORY b/haskell/haskell-entropy/HISTORY
index a7e917d..4f94123 100644
--- a/haskell/haskell-entropy/HISTORY
+++ b/haskell/haskell-entropy/HISTORY
@@ -1,3 +1,6 @@
+2018-11-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.4.1.3
+
2018-01-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.4

diff --git
a/haskell/haskell-exceptions/0001-fix-compatibility-with-ghc-8.6.1.patch
b/haskell/haskell-exceptions/0001-fix-compatibility-with-ghc-8.6.1.patch
new file mode 100644
index 0000000..7a8a9a9
--- /dev/null
+++ b/haskell/haskell-exceptions/0001-fix-compatibility-with-ghc-8.6.1.patch
@@ -0,0 +1,25 @@
+From fd78590b182c1b91964826585fa8ed5d8539b6eb Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Thu, 1 Nov 2018 18:40:21 +0100
+Subject: [PATCH] fix compatibility with ghc 8.6.1
+
+---
+ exceptions.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/exceptions.cabal b/exceptions.cabal
+index e139c92..348a900 100644
+--- a/exceptions.cabal
++++ b/exceptions.cabal
+@@ -35,7 +35,7 @@ library
+ build-depends:
+ base >= 4.3 && < 5,
+ stm >= 2.2 && < 3,
+- template-haskell >= 2.2 && < 2.14,
++ template-haskell >= 2.2,
+ transformers >= 0.2 && < 0.6,
+ transformers-compat >= 0.3 && < 0.7,
+ mtl >= 2.0 && < 2.3
+--
+2.19.1
+
diff --git a/haskell/haskell-exceptions/HISTORY
b/haskell/haskell-exceptions/HISTORY
index 283d0dc..803ceef 100644
--- a/haskell/haskell-exceptions/HISTORY
+++ b/haskell/haskell-exceptions/HISTORY
@@ -1,3 +1,6 @@
+2018-11-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-fix-compatibility-with-ghc-8.6.1.patch: removed
+
2018-10-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.10.0
* PRE_BUILD, 0001-fix-dependency-on-template-haskell.patch: removed
diff --git a/haskell/haskell-exceptions/PRE_BUILD
b/haskell/haskell-exceptions/PRE_BUILD
new file mode 100755
index 0000000..f39f88f
--- /dev/null
+++ b/haskell/haskell-exceptions/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/0001-fix-compatibility-with-ghc-8.6.1.patch"
+



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3c83876459c64ceece06db83a5e8399482ba1d58), Florian Franzmann, 11/01/2018

Archive powered by MHonArc 2.6.24.

Top of Page