Skip to content

Commit f3a1b47

Browse files
angermanandreabedini
authored andcommitted
feat: no more vowel dropping on macOS
This reverts b408167 in spirit from haskell#4656.
1 parent c9c6fe0 commit f3a1b47

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ hashedInstalledPackageIdShort pkghashinputs@PackageHashInputs{pkgHashPkgId} =
147147
-- @store/<libraryname>/libHS<libraryname>.dylib@
148148
-- where libraryname contains the libraries name, version and abi hash, but in
149149
-- @store/lib/libHS<very short libraryname>.dylib@
150-
-- where the very short library name drops all vowels from the package name,
151-
-- and truncates the hash to 4 bytes.
150+
-- where the very short library name truncates the hash to 4 bytes.
152151
--
153152
-- We therefore we only need one \@rpath entry to @store/lib@ instead of one
154153
-- \@rpath entry for each library. And the reduced library name saves some
@@ -168,7 +167,7 @@ hashedInstalledPackageIdVeryShort pkghashinputs@PackageHashInputs{pkgHashPkgId}
168167
mkComponentId $
169168
intercalate
170169
"-"
171-
[ filter (not . flip elem "aeiou") (prettyShow name)
170+
[ prettyShow name
172171
, prettyShow version
173172
, showHashValue (truncateHash 4 (hashPackageHashInputs pkghashinputs))
174173
]

cabal-testsuite/src/Test/Cabal/OutputNormalizer.hs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,6 @@ normalizeOutput nenv =
115115
-- and replace it with:
116116
-- > "-package-id","<PACKAGEDEP>"
117117
--
118-
-- Otherwise, output can not be properly normalized as on MacOs we remove
119-
-- vowels from packages to make the names shorter.
120-
-- E.g. "another-framework-0.8.1.1" -> "nthr-frmwrk-0.8.1.1"
121-
--
122-
-- This makes it impossible to have a stable package id, thus remove it completely.
123118
-- Check manually in your test-cases if the package-id needs to be verified.
124119
. resub ("\"-package-id\",\"([^\"]*)\"")
125120
"\"-package-id\",\"<PACKAGEDEP>\""

0 commit comments

Comments
 (0)