6357e33 · elk · git.iko.soy

git.iko.soy/elk

Fix cabal configure in Cabal version 1.18.

Prior to this commit the configure command fails on Cabal 1.18 with the following error: Setup.hs:91:5: `libraryConfig' is not a (visible) constructor field name Setup.hs:92:5: `compBuildOrder' is not a (visible) constructor field name Setup.hs:93:5: `executableConfigs' is not a (visible) constructor field name Setup.hs:93:57: Not in scope: `executableConfigs' This commit removes `filterLBI` in Setup.hs that called functions that have been removed from Cabal. Deleting this function shouldn't affect compilation since it seems to be unused anyway: `filterLBI`, was added in commit 14e32ad on Thu Mar 21 2013 and the only reference to it was removed on Sun Jul 28 in commit 0a6bd8bd96. After this change elm compiles for me on Cabal 1.18.0 and 1.16.0.

commit6357e330428b952f6ded5eeebe7fefa76ac659d2 authorJustin Leitgeb <justin@stackbuilders.com> dateSat 21 Sep 2013, 15:39 (13 years ago) parent811594d

1 file changed−10

compare with master

unifiedsplit

Setup.hs−10

Setup.hs−10

@@ -83,16 +83,6 @@ filterExe name pd = pd {

8383 executables = filter (\x -> (exeName x == name)) (executables pd)

8484 }

8585

86−-- It's not enough to fix the PackageDescription, we also have to fix the

87−-- LocalBuildInfo. This includes the component build order (data ComponentName)

88−-- which is horribly internal.

89−filterLBI :: String -> LocalBuildInfo -> LocalBuildInfo

90−filterLBI name lbi = lbi {

91− libraryConfig = Nothing,

92− compBuildOrder = [CExeName name],

93− executableConfigs = filter (\a -> (fst a == name)) (executableConfigs lbi)

94− }

95−

9686

9787-- Post Build

9888