summaryrefslogtreecommitdiffstats
path: root/haskell
diff options
context:
space:
mode:
authorFlorian Franzmann2019-06-08 12:04:09 +0200
committerFlorian Franzmann2019-06-08 12:17:45 +0200
commit5b4fa49564b0c4e4e4083baed621ad238168f1ed (patch)
tree2332b1018f9f124554be98b545ffb7f5d46d4b3a /haskell
parent8e821e6888a6e68e283cd92fa7370253df24c923 (diff)
haskell/haskell-generic-deriving: version 1.12.4
Diffstat (limited to 'haskell')
-rw-r--r--haskell/haskell-generic-deriving/0001-fix-compatibility-with-ghc-8.6.1.patch28
-rwxr-xr-xhaskell/haskell-generic-deriving/DETAILS4
-rw-r--r--haskell/haskell-generic-deriving/HISTORY4
-rwxr-xr-xhaskell/haskell-generic-deriving/PRE_BUILD5
4 files changed, 6 insertions, 35 deletions
diff --git a/haskell/haskell-generic-deriving/0001-fix-compatibility-with-ghc-8.6.1.patch b/haskell/haskell-generic-deriving/0001-fix-compatibility-with-ghc-8.6.1.patch
deleted file mode 100644
index 2801f44adb..0000000000
--- a/haskell/haskell-generic-deriving/0001-fix-compatibility-with-ghc-8.6.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5a021be5fd4180dadb39ea5297c8acf1fc11b1d2 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf@bandrate.org>
-Date: Thu, 1 Nov 2018 19:41:24 +0100
-Subject: [PATCH] fix compatibility with ghc 8.6.1
-
----
- generic-deriving.cabal | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/generic-deriving.cabal b/generic-deriving.cabal
-index ef56629..74cb833 100644
---- a/generic-deriving.cabal
-+++ b/generic-deriving.cabal
-@@ -75,9 +75,9 @@ library
- build-depends: base >= 4.3 && < 4.9
- other-modules: Generics.Deriving.TH.Pre4_9
-
-- build-depends: containers >= 0.1 && < 0.6
-+ build-depends: containers >= 0.1
- , ghc-prim < 1
-- , template-haskell >= 2.4 && < 2.14
-+ , template-haskell >= 2.4
- , th-abstraction >= 0.2.7 && < 0.3
-
- default-language: Haskell2010
---
-2.19.1
-
diff --git a/haskell/haskell-generic-deriving/DETAILS b/haskell/haskell-generic-deriving/DETAILS
index 00d43f0034..c302a77001 100755
--- a/haskell/haskell-generic-deriving/DETAILS
+++ b/haskell/haskell-generic-deriving/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-generic-deriving
- VERSION=1.12.2
+ VERSION=1.12.4
SOURCE="generic-deriving-${VERSION}.tar.gz"
SOURCE_URL[0]=http://hackage.haskell.org/package/generic-deriving-${VERSION}/${SOURCE}
- SOURCE_HASH=sha512:6abbc9508ab4c85536cba1cdc8d086952f0268527cd2db058492bc76d94bda58d99c47132c6deb56a24000b9fad0b043582dbc0af740c7731c1a4ebf510be7af
+ SOURCE_HASH=sha512:d3ed8369fe1ebbef2669d0e4e1befc3837d7ff59fad55d1fc495b6fdec90147110cb080638cc26f41c90550c439847bc80f928e0d480875a22bd753eabfd28c7
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/generic-deriving-${VERSION}"
WEB_SITE="https://github.com/dreixel/generic-deriving"
LICENSE[0]=BSD
diff --git a/haskell/haskell-generic-deriving/HISTORY b/haskell/haskell-generic-deriving/HISTORY
index 97358bbf89..bdc8d3a1ce 100644
--- a/haskell/haskell-generic-deriving/HISTORY
+++ b/haskell/haskell-generic-deriving/HISTORY
@@ -1,3 +1,7 @@
+2018-10-03 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.12.4
+ * PRE_BUILD, 0001-fix-compatibility-with-ghc-8.6.1.patch: removed
+
2018-11-01 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* PRE_BUILD, 0001-fix-compatibility-with-ghc-8.6.1.patch:
fix compatibility with ghc 8.6.1
diff --git a/haskell/haskell-generic-deriving/PRE_BUILD b/haskell/haskell-generic-deriving/PRE_BUILD
deleted file mode 100755
index f39f88f1f4..0000000000
--- a/haskell/haskell-generic-deriving/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SPELL_DIRECTORY/0001-fix-compatibility-with-ghc-8.6.1.patch"
-