summaryrefslogtreecommitdiff
path: root/standalone/android
diff options
context:
space:
mode:
authorGravatar Joey Hess <id@joeyh.name>2014-12-04 01:02:36 -0400
committerGravatar Joey Hess <id@joeyh.name>2014-12-04 01:02:36 -0400
commitbac97fb6028e6f27d09792b83128f9835773539f (patch)
treec5a68eb4142eef7c8354494f162471ae8bfa551b /standalone/android
parent2230c71508dc3075698150975bfcd93fb30d592e (diff)
cabal unpack --pristine
Without --pristine, cabal will update the package's cabal file if a newer one is available in hackage. But that can break applying patches. Especially since the new version from hackage can apparently have dos line endings, while the version from the tarball doesn't.
Diffstat (limited to 'standalone/android')
-rwxr-xr-xstandalone/android/install-haskell-packages4
1 files changed, 2 insertions, 2 deletions
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages
index b4ff871a9..fcc31c71c 100755
--- a/standalone/android/install-haskell-packages
+++ b/standalone/android/install-haskell-packages
@@ -32,9 +32,9 @@ patched () {
ver="$(grep " $pkg " ../cabal.config | cut -d= -f 3 | sed 's/,$//')"
fi
if [ -z "$ver" ]; then
- cabal unpack $pkg
+ cabal unpack --pristine $pkg
else
- cabal unpack $pkg-$ver
+ cabal unpack --pristine $pkg-$ver
fi
cd $pkg*
git init