File tree Expand file tree Collapse file tree 2 files changed +2
-8
lines changed
cabal-install/src/Distribution/Client
cabal-testsuite/src/Test/Cabal Expand file tree Collapse file tree 2 files changed +2
-8
lines changed Original file line number Diff line number Diff line change @@ -147,8 +147,7 @@ hashedInstalledPackageIdShort pkghashinputs@PackageHashInputs{pkgHashPkgId} =
147
147
-- @store/<libraryname>/libHS<libraryname>.dylib@
148
148
-- where libraryname contains the libraries name, version and abi hash, but in
149
149
-- @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.
152
151
--
153
152
-- We therefore we only need one \@rpath entry to @store/lib@ instead of one
154
153
-- \@rpath entry for each library. And the reduced library name saves some
@@ -168,7 +167,7 @@ hashedInstalledPackageIdVeryShort pkghashinputs@PackageHashInputs{pkgHashPkgId}
168
167
mkComponentId $
169
168
intercalate
170
169
" -"
171
- [ filter ( not . flip elem " aeiou " ) ( prettyShow name)
170
+ [ prettyShow name
172
171
, prettyShow version
173
172
, showHashValue (truncateHash 4 (hashPackageHashInputs pkghashinputs))
174
173
]
Original file line number Diff line number Diff line change @@ -115,11 +115,6 @@ normalizeOutput nenv =
115
115
-- and replace it with:
116
116
-- > "-package-id","<PACKAGEDEP>"
117
117
--
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.
123
118
-- Check manually in your test-cases if the package-id needs to be verified.
124
119
. resub (" \" -package-id\" ,\" ([^\" ]*)\" " )
125
120
" \" -package-id\" ,\" <PACKAGEDEP>\" "
You can’t perform that action at this time.
0 commit comments