Skip to content

Commit 7d99576

Browse files
committed
refactor(cabal-install,Cabal): move programDbSignature to Cabal
1 parent 9cf9caa commit 7d99576

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

Cabal/src/Distribution/Simple/Program/Db.hs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ module Distribution.Simple.Program.Db
6767
, ConfiguredProgs
6868
, updateUnconfiguredProgs
6969
, updateConfiguredProgs
70+
, programDbSignature
7071
) where
7172

7273
import Distribution.Compat.Prelude
@@ -564,3 +565,17 @@ requireProgramVersion verbosity prog range programDb =
564565
join $
565566
either (dieWithException verbosity) return
566567
`fmap` lookupProgramVersion verbosity prog range programDb
568+
569+
-- | Select the bits of a 'ProgramDb' to monitor for value changes.
570+
-- Use 'programsMonitorFiles' for the files to monitor.
571+
programDbSignature :: ProgramDb -> [ConfiguredProgram]
572+
programDbSignature progdb =
573+
[ prog
574+
{ programMonitorFiles = []
575+
, programOverrideEnv =
576+
filter
577+
((/= "PATH") . fst)
578+
(programOverrideEnv prog)
579+
}
580+
| prog <- configuredPrograms progdb
581+
]

cabal-install/src/Distribution/Client/ProjectPlanning.hs

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ module Distribution.Client.ProjectPlanning
9595
, binDirectories
9696
, storePackageInstallDirs
9797
, storePackageInstallDirs'
98+
99+
-- * Re-exports for backward compatibility
100+
, programDbSignature
98101
) where
99102

100103
import Distribution.Client.Compat.Prelude
@@ -992,20 +995,6 @@ programsMonitorFiles progdb =
992995
(programPath prog)
993996
]
994997

995-
-- | Select the bits of a 'ProgramDb' to monitor for value changes.
996-
-- Use 'programsMonitorFiles' for the files to monitor.
997-
programDbSignature :: ProgramDb -> [ConfiguredProgram]
998-
programDbSignature progdb =
999-
[ prog
1000-
{ programMonitorFiles = []
1001-
, programOverrideEnv =
1002-
filter
1003-
((/= "PATH") . fst)
1004-
(programOverrideEnv prog)
1005-
}
1006-
| prog <- configuredPrograms progdb
1007-
]
1008-
1009998
getInstalledPackages
1010999
:: Verbosity
10111000
-> Compiler

0 commit comments

Comments
 (0)