summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Julian Ospald <hasufell@posteo.de> 2017-01-14 20:04:37 +0100
committerAvatar Marc-Antoine Perennou <Marc-Antoine@Perennou.com> 2017-02-06 11:20:26 +0100
commit169512cd40d7f81dbc0e4bd192e5bbefefcf332e (patch)
tree4a261558eec7d8385ef09a6a26ae0524a8ecfc67
parentaabeec353b667e8746c42df01c8334186bf9c9a0 (diff)
downloadhaskell-169512cd40d7f81dbc0e4bd192e5bbefefcf332e.tar.gz
haskell-169512cd40d7f81dbc0e4bd192e5bbefefcf332e.tar.xz
dev-haskell/test-framework: fix build with time-1.6.*
Change-Id: Ie1a92495f1575ab9795754bb75d8f2b03a2654a2 Reviewed-on: https://galileo.mailstation.de/gerrit/8022 Reviewed-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-rw-r--r--packages/dev-haskell/test-framework/files/0001-Fix-upper-bound-on-time.patch25
-rw-r--r--packages/dev-haskell/test-framework/test-framework-0.8.1.1-r1.exheres-04
2 files changed, 29 insertions, 0 deletions
diff --git a/packages/dev-haskell/test-framework/files/0001-Fix-upper-bound-on-time.patch b/packages/dev-haskell/test-framework/files/0001-Fix-upper-bound-on-time.patch
new file mode 100644
index 0000000..35b7394
--- /dev/null
+++ b/packages/dev-haskell/test-framework/files/0001-Fix-upper-bound-on-time.patch
@@ -0,0 +1,25 @@
+From 20c923a75c962b04cbcdf3f3d46bafa05d572b56 Mon Sep 17 00:00:00 2001
+From: Julian Ospald <hasufell@posteo.de>
+Date: Sat, 14 Jan 2017 20:03:25 +0100
+Subject: [PATCH] Fix upper bound on 'time'
+
+---
+ test-framework.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test-framework.cabal b/test-framework.cabal
+index 612bee6..e3d13df 100644
+--- a/test-framework.cabal
++++ b/test-framework.cabal
+@@ -50,7 +50,7 @@ Library
+ base >= 4.3 && < 5, random >= 1.0, containers >= 0.1,
+ regex-posix >= 0.72,
+ old-locale >= 1.0,
+- time >= 1.1.2 && < 1.6,
++ time >= 1.1.2 && < 1.7,
+ xml >= 1.3.5, hostname >= 1.0
+
+ Extensions: CPP
+--
+2.11.0
+
diff --git a/packages/dev-haskell/test-framework/test-framework-0.8.1.1-r1.exheres-0 b/packages/dev-haskell/test-framework/test-framework-0.8.1.1-r1.exheres-0
index 6e46950..f8447d9 100644
--- a/packages/dev-haskell/test-framework/test-framework-0.8.1.1-r1.exheres-0
+++ b/packages/dev-haskell/test-framework/test-framework-0.8.1.1-r1.exheres-0
@@ -32,3 +32,7 @@ DEPENDENCIES="
")
"
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/0001-Fix-upper-bound-on-time.patch
+)
+