From 33d6057ca3e9f8d2106a22274220187904038b6c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 4 Dec 2014 01:02:36 -0400 Subject: [PATCH] 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. --- standalone/android/install-haskell-packages | 4 ++-- standalone/linux/install-haskell-packages | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index b4ff871a90..fcc31c71c5 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 diff --git a/standalone/linux/install-haskell-packages b/standalone/linux/install-haskell-packages index 0ddc70b6a5..6fa4aeb170 100755 --- a/standalone/linux/install-haskell-packages +++ b/standalone/linux/install-haskell-packages @@ -28,9 +28,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