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 @@ -149,8 +149,7 @@ hashedInstalledPackageIdShort pkghashinputs@PackageHashInputs{pkgHashPkgId} =
149149-- @store/<libraryname>/libHS<libraryname>.dylib@
150150-- where libraryname contains the libraries name, version and abi hash, but in
151151-- @store/lib/libHS<very short libraryname>.dylib@
152- -- where the very short library name drops all vowels from the package name,
153- -- and truncates the hash to 4 bytes.
152+ -- where the very short library name truncates the hash to 4 bytes.
154153--
155154-- We therefore we only need one \@rpath entry to @store/lib@ instead of one
156155-- \@rpath entry for each library. And the reduced library name saves some
@@ -170,7 +169,7 @@ hashedInstalledPackageIdVeryShort pkghashinputs@PackageHashInputs{pkgHashPkgId}
170169 mkComponentId $
171170 intercalate
172171 " -"
173- [ filter ( not . flip elem " aeiou " ) ( prettyShow name)
172+ [ prettyShow name
174173 , prettyShow version
175174 , showHashValue (truncateHash 4 (hashPackageHashInputs pkghashinputs))
176175 ]
Original file line number Diff line number Diff 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>\" "
You can’t perform that action at this time.
0 commit comments