haskell generic-builder: Fix package conf handling#78738
haskell generic-builder: Fix package conf handling#78738infinisil wants to merge 5 commits intoNixOS:haskell-updatesfrom
Conversation
This update was generated by hackage2nix v2.15.0-14-gb942b6a from Hackage revision commercialhaskell/all-cabal-hashes@dd3690b.
https://mail.haskell.org/pipermail/ghc-devs/2020-January/018530.html The version previously fetched was `8.10.0.20200108`.
ghc: update 8.10.1 pre-release to announced rc1
This update was generated by hackage2nix v2.15.0-14-gb942b6a from Hackage revision commercialhaskell/all-cabal-hashes@31aa820.
|
Such that people can find this issue, here is the error message this fixes on macOS using GHC 8.8.1 (can occur during building or running): |
33ab8a7 to
e954dc7
Compare
Ericson2314
left a comment
There was a problem hiding this comment.
Nice work munging around with the stuff. We should raise the issue upstream that they ought to migrate to more standardized encodings.
e954dc7 to
8029329
Compare
Previously the package conf files were handled without paying attention
to the fact that it's pretty-printed output. One problem was discovered
with GHC 8.8.1 on Darwin, where the dynamic-library-dirs first field
seems to have increased in length, meaning while before it was
dynamic-library-dirs: some-small-directory-name
some-more-directories
Now it is
dynamic-library-dirs:
some-larger-directory-name
some-more-directories
Which breaks the code installed for NixOS#25537,
because that assumed the former format, resulting in the reoccurence of
the bug in NixOS#22810, see
infinisil/all-hies#43
This commit fixes this by "unprettyfying" the package conf files before
processing them.
8029329 to
8be38e9
Compare
|
Oh and another change of behavior is how now all directories in |
|
With this change I just pushed I can confirm that this fixes the issue |
|
Anybody have any objections? Otherwise I'd like to have this merged soon |
Previously the package conf files were handled without paying attention
to the fact that it's pretty-printed output. One problem was discovered
with GHC 8.8.1 on Darwin, where the dynamic-library-dirs first field
seems to have increased in length, meaning while before it was
dynamic-library-dirs: some-small-directory-name
some-more-directories
Now it is
dynamic-library-dirs:
some-larger-directory-name
some-more-directories
Which breaks the code installed for #25537,
because that assumed the former format, resulting in the reoccurence of
the bug in #22810, see
infinisil/all-hies#43
This commit fixes this by "unprettyfying" the package conf files before
processing them.
Closes #78738.
|
Pushed in 55a8169. Test builds are running at https://hydra.nixos.org/eval/1567978. |
|
Seems to be failing, but that very much seems unrelated: I hope that's just a transient failure, I'll restart the build |
|
Nevermind, I can't restart that job, "Only the project members, administrators, and accounts with restart-jobs privileges can perform this operation." |
|
I have restarted the |
This nixpkgs version includes NixOS/nixpkgs#78738
Previously the package conf files were handled without paying attention
to the fact that it's pretty-printed output. One problem was discovered
with GHC 8.8.1 on Darwin, where the dynamic-library-dirs first field
seems to have increased in length, meaning while before it was
dynamic-library-dirs: some-small-directory-name
some-more-directories
Now it is
dynamic-library-dirs:
some-larger-directory-name
some-more-directories
Which breaks the code installed for NixOS#25537,
because that assumed the former format, resulting in the reoccurence of
the bug in NixOS#22810, see
infinisil/all-hies#43
This commit fixes this by "unprettyfying" the package conf files before
processing them.
Closes NixOS#78738.
Previously the package conf files were handled without paying attention
to the fact that it's pretty-printed output. One problem was discovered
with GHC 8.8.1 on Darwin, where the dynamic-library-dirs first field
seems to have increased in length, meaning while before it was
dynamic-library-dirs: some-small-directory-name
some-more-directories
Now it is
dynamic-library-dirs:
some-larger-directory-name
some-more-directories
Which breaks the code installed for NixOS#25537,
because that assumed the former format, resulting in the reoccurence of
the bug in NixOS#22810, see
infinisil/all-hies#43
This commit fixes this by "unprettyfying" the package conf files before
processing them.
Closes NixOS#78738.
Motivation for this change
Previously the package conf files were handled without paying attention to the fact that it's pretty-printed output. One problem was discovered with GHC 8.8.1 on Darwin, where the dynamic-library-dirs first field seems to have increased in length, meaning while before it was
Now it is
Which breaks the code installed for #25537 because it assumed the former format, resulting in the reoccurence of the bug in #22810, see infinisil/all-hies#43
This commit fixes this by unprettifying the package conf files before
processing them. This also gets rid of a nasty sed expression previously used to do this conf format juggling
The only change of behavior is that whereas previously above line would be changed to
it now is changed to (
some-more-directoriesisn't present anymore)But this isn't a problem because all
.dylib's in those directories will have been symlinked into$out/lib/linksanyways.Ping @peti @copumpkin @Ericson2314 @LnL7 @shlevy
Things done