From 60e8eca25f3f43f73c4876d93b5489b7d90037f7 Mon Sep 17 00:00:00 2001 From: 3noch Date: Thu, 13 Aug 2015 15:44:26 -0400 Subject: [PATCH] Upgrade to NSIS 3.0b2 and LTS 3.0 --- Installer.hs | 6 +----- README.md | 6 +++--- stack.yaml | 5 +---- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Installer.hs b/Installer.hs index b8f7f27..f82f927 100644 --- a/Installer.hs +++ b/Installer.hs @@ -54,11 +54,7 @@ installer projRoot arch version = nsis $ do file [Recursive] "bin/7z.*" file [Recursive] "bin/minghc-post-install.exe.7z" file [Recursive] "bin/all-*" - let shortArch = - case arch of - Arch32 -> "32" - Arch64 -> "64" - file [Recursive] $ fromString $ concat ["bin/", shortArch, "-*"] + file [Recursive] $ fromString $ concat ["bin/", showArchAbbr arch, "-*"] execWait "\"$INSTDIR/bin/7z.exe\" x -y \"-o$INSTDIR/bin\" \"$INSTDIR/bin/minghc-post-install.exe.7z\"" NSIS.delete [] "$INSTDIR/bin/minghc-post-install.exe.7z" diff --git a/README.md b/README.md index bf693e6..6b7f015 100644 --- a/README.md +++ b/README.md @@ -44,9 +44,9 @@ Users of MinGHC installers do not need to build it themselves. Below are instruc You need NSIS installed: -* Download [NSIS 3.0b1](http://nsis.sourceforge.net/), install it, and place the installation directory on your `PATH`. -* Patch NSIS with the [large strings build for 3.0b1](http://prdownloads.sourceforge.net/nsis/nsis-3.0b1-strlen_8192.zip?download) - found among its [special builds](http://nsis.sourceforge.net/Special_Builds). (The patch is applied by copying +* Download [NSIS 3.0b2](http://nsis.sourceforge.net/), install it, and place the installation directory on your `PATH`. +* Patch NSIS with the **large strings build for 3.0b2** found among its + [special builds](http://nsis.sourceforge.net/Special_Builds). (The patch is applied by copying the files in the patch archive over top the NSIS installation.) ### Building Installers diff --git a/stack.yaml b/stack.yaml index 0c68f35..1e2eb65 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,6 +1,3 @@ -extra-deps: -- nsis-0.3 -resolver: lts-2.20 -flags: {} +resolver: lts-3.0 packages: - '.'