Skip to content

Put command line --with-PROG into AllPackages #5018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 8, 2018
Merged

Put command line --with-PROG into AllPackages #5018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f178c8a
Put command line --with-PROG into AllPackages
angerman Jan 12, 2018
5fc4d48
Adds changelog entry.
angerman Jan 12, 2018
50bfb74
Adds decision rule.
angerman Jan 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions cabal-install/Distribution/Client/ProjectConfig/Legacy.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,34 @@ commandLineFlagsToProjectConfig globalFlags configFlags configExFlags
projectConfigShared = convertLegacyAllPackageFlags
globalFlags configFlags
configExFlags installFlags,
projectConfigLocalPackages = convertLegacyPerPackageFlags
configFlags installFlags haddockFlags
projectConfigLocalPackages = localConfig,
projectConfigAllPackages = allConfig
}

where (localConfig, allConfig) = splitConfig
(convertLegacyPerPackageFlags
configFlags installFlags haddockFlags)
-- split the package config (from command line arguments) into
-- those applied to all packages and those to local only.
--
-- for now we will just copy over the ProgramPaths/Args/Extra into
-- the AllPackages. The LocalPackages do not inherit them from
-- AllPackages, and as such need to retain them.
--
-- The general decision rule for what to put into allConfig
-- into localConfig is the following:
--
-- - anything that is host/toolchain/env specific should be applied
-- to all packages, as packagesets have to be host/toolchain/env
-- consistent.
-- - anything else should be in the local config and could potentially
-- be lifted into all-packages vial the `package *` cabal.project
-- section.
--
splitConfig :: PackageConfig -> (PackageConfig, PackageConfig)
splitConfig pc = (pc
, mempty { packageConfigProgramPaths = packageConfigProgramPaths pc
, packageConfigProgramArgs = packageConfigProgramArgs pc
, packageConfigProgramPathExtra = packageConfigProgramPathExtra pc })

-- | Convert from the types currently used for the user-wide @~/.cabal/config@
-- file into the 'ProjectConfig' type.
Expand Down
2 changes: 2 additions & 0 deletions cabal-install/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
-*-change-log-*-

2.2.0.0 (current development version)
* '--with-PROG' and '--PROG-options' are applied to all packages
and not local packages only (#5019).
* Completed the 'new-update' command (#4809), which respects nix-style
cabal.project(.local) files and allows to update from
multiple repositories when using overlays.
Expand Down