Merge branch 'Elewyth-feature/add-windows-registry-displayversion'

Author: mpilgrem

ChangeLog.md

@@ -19,6 +19,8 @@ Behavior changes:
 Other enhancements:
 
 * Bump to `hpack-0.35.0`.
+* On Windows, the installer now sets `DisplayVersion` in the registry, enabling
+  tools like `winget` to properly read the version number.
 
 Bug fixes:
 

etc/scripts/build-stack-installer.hs

@@ -16,7 +16,7 @@ import Development.NSIS.Plugins.EnvVarUpdate
 
 main :: IO ()
 main = do
-  [srcPath, execPath, nsiPath] <- getArgs
+  [srcPath, execPath, nsiPath, stackVersionStr] <- getArgs
 
   writeFile (fromString nsiPath) $ nsis $ do
     _ <- constantStr "Name" "Haskell Stack"
@@ -43,6 +43,7 @@ main = do
 
       -- Write the uninstall keys for Windows
       writeRegStr HKCU "Software/Microsoft/Windows/CurrentVersion/Uninstall/$Name" "DisplayName" "$Name"
+      writeRegStr HKCU "Software/Microsoft/Windows/CurrentVersion/Uninstall/$Name" "DisplayVersion" (str stackVersionStr)
       writeRegStr HKCU "Software/Microsoft/Windows/CurrentVersion/Uninstall/$Name" "UninstallString" "\"$INSTDIR/uninstall-stack.exe\""
       writeRegDWORD HKCU "Software/Microsoft/Windows/CurrentVersion/Uninstall/$Name" "NoModify" 1
       writeRegDWORD HKCU "Software/Microsoft/Windows/CurrentVersion/Uninstall/$Name" "NoRepair" 1

etc/scripts/release.hs

@@ -259,6 +259,7 @@ rules global@Global{..} args = do
             [ binaryExeFileName
             , binaryInstallerFileName
             , out
+            , stackVersionStr global
             ] :: Action ()
 
     releaseBinDir </> binaryName </> stackExeFileName %> \out -> do