49 lines
2.9 KiB
Diff
49 lines
2.9 KiB
Diff
diff -up stack-2.15.7/src/Stack/Config.hs~ stack-2.15.7/src/Stack/Config.hs
|
|
--- stack-2.15.7/src/Stack/Config.hs~ 2024-05-12 22:50:13.000000000 +0800
|
|
+++ stack-2.15.7/src/Stack/Config.hs 2024-08-02 01:21:01.138918479 +0800
|
|
@@ -435,9 +435,9 @@ configFromConfigMonoid
|
|
fromFirst Constants.hackageBaseUrl configMonoid.hackageBaseUrl
|
|
hideSourcePaths = fromFirstTrue configMonoid.hideSourcePaths
|
|
recommendUpgrade = fromFirstTrue configMonoid.recommendUpgrade
|
|
- notifyIfNixOnPath = fromFirstTrue configMonoid.notifyIfNixOnPath
|
|
- notifyIfGhcUntested = fromFirstTrue configMonoid.notifyIfGhcUntested
|
|
- notifyIfCabalUntested = fromFirstTrue configMonoid.notifyIfCabalUntested
|
|
+ notifyIfNixOnPath = fromFirstFalse configMonoid.notifyIfNixOnPath
|
|
+ notifyIfGhcUntested = fromFirstFalse configMonoid.notifyIfGhcUntested
|
|
+ notifyIfCabalUntested = fromFirstFalse configMonoid.notifyIfCabalUntested
|
|
notifyIfArchUnknown = fromFirstTrue configMonoid.notifyIfArchUnknown
|
|
noRunCompile = fromFirstFalse configMonoid.noRunCompile
|
|
allowDifferentUser <-
|
|
diff -up stack-2.15.7/src/Stack/Types/ConfigMonoid.hs~ stack-2.15.7/src/Stack/Types/ConfigMonoid.hs
|
|
--- stack-2.15.7/src/Stack/Types/ConfigMonoid.hs~ 2024-05-12 22:50:14.000000000 +0800
|
|
+++ stack-2.15.7/src/Stack/Types/ConfigMonoid.hs 2024-08-02 01:20:22.724711778 +0800
|
|
@@ -170,11 +170,11 @@ data ConfigMonoid = ConfigMonoid
|
|
-- ^ See 'configHideSourcePaths'
|
|
, recommendUpgrade :: !FirstTrue
|
|
-- ^ See 'configRecommendUpgrade'
|
|
- , notifyIfNixOnPath :: !FirstTrue
|
|
+ , notifyIfNixOnPath :: !FirstFalse
|
|
-- ^ See 'configNotifyIfNixOnPath'
|
|
- , notifyIfGhcUntested :: !FirstTrue
|
|
+ , notifyIfGhcUntested :: !FirstFalse
|
|
-- ^ See 'configNotifyIfGhcUntested'
|
|
- , notifyIfCabalUntested :: !FirstTrue
|
|
+ , notifyIfCabalUntested :: !FirstFalse
|
|
-- ^ See 'configNotifyIfCabalUntested'
|
|
, notifyIfArchUnknown :: !FirstTrue
|
|
-- ^ See 'configNotifyIfArchUnknown'
|
|
@@ -317,11 +317,11 @@ parseConfigMonoidObject rootDir obj = do
|
|
let styles = fromMaybe mempty $ configMonoidStylesUS <|> configMonoidStylesGB
|
|
hideSourcePaths <- FirstTrue <$> obj ..:? configMonoidHideSourcePathsName
|
|
recommendUpgrade <- FirstTrue <$> obj ..:? configMonoidRecommendUpgradeName
|
|
- notifyIfNixOnPath <- FirstTrue <$> obj ..:? configMonoidNotifyIfNixOnPathName
|
|
+ notifyIfNixOnPath <- FirstFalse <$> obj ..:? configMonoidNotifyIfNixOnPathName
|
|
notifyIfGhcUntested <-
|
|
- FirstTrue <$> obj ..:? configMonoidNotifyIfGhcUntestedName
|
|
+ FirstFalse <$> obj ..:? configMonoidNotifyIfGhcUntestedName
|
|
notifyIfCabalUntested <-
|
|
- FirstTrue <$> obj ..:? configMonoidNotifyIfCabalUntestedName
|
|
+ FirstFalse <$> obj ..:? configMonoidNotifyIfCabalUntestedName
|
|
notifyIfArchUnknown <-
|
|
FirstTrue <$> obj ..:? configMonoidNotifyIfArchUnknownName
|
|
casaOpts <- jsonSubWarnings (obj ..:? configMonoidCasaOptsName ..!= mempty)
|