fpc: 3.0.4 -> 3.2.0, add support for aarch64-linux #97006
Conversation
timokau
changed the title
timokau
force-pushed
the
fpc-3.2.0-aarch64
branch
from
31d6250
to
7e8ee7a
Compare
timokau
force-pushed
the
fpc-3.2.0-aarch64
branch
from
7e8ee7a
to
c0ca8f5
Compare
Update required for compatibility with fpc 3.2.0.
Might as well update it while I fix it up for the fpc update.
timokau
force-pushed
the
fpc-3.2.0-aarch64
branch
from
c0ca8f5
to
71aa1f7
Compare
There was no 3.1 for some reason. The old sed-based path patching was broken and resulted in syntax errors since it was a bit over-eager. Instead of fixing it, I decided to replace it with a patch file which is easier to inspect and will fail in a more obvious way next time. The patch is now applied unconditionally, since it actually applies to all linux platforms. The changes are localized to linux-specific code, so it does not hurt to apply it on non-linux platforms as well. Hedgewars needs a small fix to work with the new version. Done in the same commit to avoid a broken commit.
Supported since fpc 3.2.0.
timokau
force-pushed
the
fpc-3.2.0-aarch64
branch
from
71aa1f7
to
6ff5c40
Compare
|
I have run |
| versionBase = "0.4"; | ||
| versionSuffix = "alpha4"; | ||
| in stdenv.mkDerivation rec { | ||
| pname = "ddrescueview"; |
There was a problem hiding this comment.
No. As I said in the PR description, ddrescueview would be broken by the fpc update and the update fixes it. The ultrastardx update is not strictly necessary (the patch would also apply to the old version), but why not do it while I'm at it.
There was a problem hiding this comment.
Ah, a race condition in our GitHub use, I guess.
|
Yeah, the patch is of course likely to fail in a slightly more obvious way but sooner… But the state after the PR looks OK |
|
Yes but it should be trivial to adapt. I spent quite some time debugging the build because I didn't realize the "sed" was having unintended side-effects. Do you think the PR is okay as-is? |
|
Yes but it should be trivial to adapt. I spent quite some time debugging the build because I didn't realize the "sed" was having unintended side-effects. Do you think the PR is okay as-is?
Yes, as I said, this is also fine.
|
|
Great, I wasn't entirely sure what you meant by "state after the PR". Thanks for the review, I'll merge after ofBorg approves then :) |
|
The darwin check has been pending for 2.5h now and I think failure probability is very low (since darwin as a platform is not even enabled for fpc). Merging without it as all other checks pass. |
Motivation for this change
I want to play hedgewars on my raspberry pi. For that I need fpc on aarch64, which required an fpc update.
There was no 3.1 for some reason. The old sed-based path patching was
broken and resulted in syntax errors since it was a bit over-eager.
Instead of fixing it, I decided to replace it with a patch file which is
easier to inspect and will fail in a more obvious way next time.
The patch is now applied unconditionally, since it actually applies to
all linux platforms. The changes are localized to linux-specific code,
so it does not hurt to apply it on non-linux platforms as well.
CC @7c6f434c
Also updates
ddrescueviewandultrastardxsince those were broken by thefpcupdate.Unfortunately
hedgewarsstill doesn't quite build on aarch64, but that is an unrelated issue.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)