Skip to content
This repository was archived by the owner on Feb 3, 2022. It is now read-only.

Commit 0ad0b1c

Browse files
committed
Get minimal/full packages using bcIncludeExtra
[The HP installers 8.0.1-a for Windows already included this fix.] * hptool/src/Package.hs * Package.hs was using allPackages sometimes with True and other times with False rather than always being from bcIncludeExtra, which was causing the "full" flavor on Windows to not get all the packages.
1 parent 30b0d94 commit 0ad0b1c

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

hptool/src/Package.hs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ packageRules = do
4747

4848
packageDepsFile PackageWildCard %> \depFile -> do
4949
hpRel <- askHpRelease
50-
installAction depFile hpRel
50+
bc <- askBuildConfig
51+
installAction depFile (bcIncludeExtra bc) hpRel
5152

5253
listBuild %> \out -> do
5354
hpRel <- askHpRelease
@@ -64,8 +65,8 @@ packageRules = do
6465
-- components come out closer to normal sort order. Go figure!
6566

6667

67-
installAction :: FilePath -> Release -> Action ()
68-
installAction depFile hpRel = do
68+
installAction :: FilePath -> Bool -> Release -> Action ()
69+
installAction depFile incExtras hpRel = do
6970
let pkg = extractPackage depFile
7071
let srcDir = packageSourceDir pkg
7172
need [ dir srcDir ]
@@ -89,7 +90,7 @@ installAction depFile hpRel = do
8990

9091
constraints =
9192
map (\p -> pkgName p ++ "==" ++ showVersion (pkgVersion p)) $
92-
(allPackages True) hpRel
93+
(allPackages incExtras) hpRel
9394

9495
decode out = case drop 1 $ lines out of
9596
("All the requested packages are already installed:":_) ->
@@ -105,4 +106,4 @@ installAction depFile hpRel = do
105106
++ unwords (filter (not . (`elem` packages)) deps) ++ "\n" ++ "Could not build " ++ depFile
106107
_ -> Left out
107108

108-
packages = map show $ (allPackages True) hpRel --note should be False if minimal...
109+
packages = map show $ (allPackages incExtras) hpRel

0 commit comments

Comments
 (0)