summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-28 14:21:57 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-28 14:21:57 -0400
commit3cc773661f43e68a973f12800b33cf823e35c31f (patch)
tree9318e1df9ceb143752f259e9325e1f7f4f3e0dcc
parent4e6ae471667beaa308607b3b03522ebabaf3014a (diff)
pin unix to already installed version
This prevents multiple versions of unix, from ghc and needed by newer versions of some packages conflicting. Had to update the bytestring and blaze-builder pins follow-on from this change.
-rw-r--r--doc/bugs/Android_chroot_stuck_in_Cabal_hell.mdwn2
-rw-r--r--doc/bugs/Android_chroot_stuck_in_Cabal_hell/comment_4_3dd3b8005fef7a5dad69b7d1c1154235._comment7
-rw-r--r--standalone/android/cabal.config6
3 files changed, 13 insertions, 2 deletions
diff --git a/doc/bugs/Android_chroot_stuck_in_Cabal_hell.mdwn b/doc/bugs/Android_chroot_stuck_in_Cabal_hell.mdwn
index 1587d4a66..1cca413a6 100644
--- a/doc/bugs/Android_chroot_stuck_in_Cabal_hell.mdwn
+++ b/doc/bugs/Android_chroot_stuck_in_Cabal_hell.mdwn
@@ -18,3 +18,5 @@ collect2: error: ld returned 1 exit status
Makefile:225: recipe for target 'android' failed
make: *** [android] Error 1
"""]]
+
+> [[fixed|done]] --[[Joey]]
diff --git a/doc/bugs/Android_chroot_stuck_in_Cabal_hell/comment_4_3dd3b8005fef7a5dad69b7d1c1154235._comment b/doc/bugs/Android_chroot_stuck_in_Cabal_hell/comment_4_3dd3b8005fef7a5dad69b7d1c1154235._comment
new file mode 100644
index 000000000..abf801c75
--- /dev/null
+++ b/doc/bugs/Android_chroot_stuck_in_Cabal_hell/comment_4_3dd3b8005fef7a5dad69b7d1c1154235._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 4"""
+ date="2016-04-28T17:21:00Z"
+ content="""
+Reproduced, fixed.
+"""]]
diff --git a/standalone/android/cabal.config b/standalone/android/cabal.config
index 67e98523e..a55d85b24 100644
--- a/standalone/android/cabal.config
+++ b/standalone/android/cabal.config
@@ -1,4 +1,5 @@
-constraints: Crypto ==4.2.5.1,
+constraints: unix installed,
+ Crypto ==4.2.5.1,
binary ==0.7.6.1,
DAV ==1.0.3,
HTTP ==4000.2.17,
@@ -85,6 +86,7 @@ constraints: Crypto ==4.2.5.1,
http-conduit ==2.1.5,
http-date ==0.0.2,
http-types ==0.8.5,
+ blaze-builder ==0.3.3.2,
hxt ==9.3.1.4,
hxt-charproperties ==9.1.1.1,
hxt-regex-xmlschema ==9.0.4,
@@ -195,6 +197,6 @@ constraints: Crypto ==4.2.5.1,
yesod-routes ==1.2.0.7,
yesod-static ==1.2.4,
zlib ==0.5.4.1,
- bytestring ==0.10.4.0,
+ bytestring installed,
scientific ==0.3.3.1,
clock ==0.4.6.0