Skip to content

Comments

tectonic-unwrapped: fix build with icu 75#392621

Merged
doronbehar merged 1 commit intoNixOS:masterfrom
bryango:dev
Mar 24, 2025
Merged

tectonic-unwrapped: fix build with icu 75#392621
doronbehar merged 1 commit intoNixOS:masterfrom
bryango:dev

Conversation

@bryango
Copy link
Member

@bryango bryango commented Mar 24, 2025

Fixes #392552.

I have found a way to cherry-pick the necessary patches from upstream's master. The patch has to be vendored due to some trivial whitespace differences that prevent it to apply directly. This is fixed by hand in the second commit (the first commit contains only the original, unmodified patch).

Build success: https://github.com/bryango/nix-build-action/actions/runs/14028664706/job/39271728385

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@bryango bryango mentioned this pull request Mar 24, 2025
3 tasks
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 24, 2025
@bryango bryango changed the title tectonic-unwrapped: fix build with vendored patch tectonic-unwrapped: fix build with icu 75 Mar 24, 2025
@stephen-huan
Copy link
Member

Works, except it seems texpresso needs to be updated.

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 392621


x86_64-linux

❌ 1 package failed to build:
  • texpresso
✅ 2 packages built:
  • tectonic
  • tectonic-unwrapped

@bryango
Copy link
Member Author

bryango commented Mar 24, 2025

@stephen-huan Thank you very much for the review! I pushed a new version which saves us from vendoring the patch. Can you see if the newer version also works? I will look into the texpresso failure.

@stephen-huan
Copy link
Member

Seems texpresso works now, nice.

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 392621


x86_64-linux

✅ 3 packages built:
  • tectonic
  • tectonic-unwrapped
  • texpresso

@bryango bryango marked this pull request as ready for review March 24, 2025 06:18
@nix-owners nix-owners bot requested review from doronbehar and lluchs March 24, 2025 06:26
Copy link
Member

@stephen-huan stephen-huan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works for me (see nixpkgs-review in #392621 (comment)).

As mentioned in #392552 (comment), it's 009de06 (#386191) which breaks it but this fix is probably even cleaner than trying to figure out the interaction with clang.

Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff LGTM. Well done on the investigation @bryango !

@doronbehar doronbehar merged commit 2bb3976 into NixOS:master Mar 24, 2025
92 of 95 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Build failure: tectonic-unwrapped

3 participants