From ca66b6405676b2c1d33f35a759342fcc2b1fd38b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 17 May 2013 13:16:21 -0400 Subject: [PATCH] fixes --- standalone/windows/build.sh | 2 +- ...hack-around-strange-build-problem-in-jenkins-autobui.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index fd833d8306..ec3efeeb88 100644 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -25,7 +25,7 @@ rm -rf MissingH-1.2.0.0 cabal unpack MissingH cd MissingH-1.2.0.0 incygwin patch -p1 <../standalone/windows/haskell-patches/MissingH_1.2.0.0-0001-hack-around-strange-build-problem-in-jenkins-autobui.patch -cabal install --reinstall +cabal install || true cd .. cabal install --only-dependencies -f"$FLAGS" diff --git a/standalone/windows/haskell-patches/MissingH_1.2.0.0-0001-hack-around-strange-build-problem-in-jenkins-autobui.patch b/standalone/windows/haskell-patches/MissingH_1.2.0.0-0001-hack-around-strange-build-problem-in-jenkins-autobui.patch index 72aa54e00b..be18ff23f6 100644 --- a/standalone/windows/haskell-patches/MissingH_1.2.0.0-0001-hack-around-strange-build-problem-in-jenkins-autobui.patch +++ b/standalone/windows/haskell-patches/MissingH_1.2.0.0-0001-hack-around-strange-build-problem-in-jenkins-autobui.patch @@ -38,8 +38,8 @@ index 473490d..0eea21b 100644 - accessTime = fromInteger epochtime, - modificationTime = fromInteger epochtime, - statusChangeTime = fromInteger epochtime -+ accessTime = undefined -- fromInteger epochtime, -+ modificationTime = undefined -- fromInteger epochtime, ++ accessTime = undefined, -- fromInteger epochtime, ++ modificationTime = undefined, -- fromInteger epochtime, + statusChangeTime = undefined -- fromInteger epochtime } #endif