Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tectonic: wrap with a correct --web-bundle #286615

Merged
merged 3 commits into from
Feb 6, 2024
Merged

tectonic: wrap with a correct --web-bundle #286615

merged 3 commits into from
Feb 6, 2024

Conversation

bryango
Copy link
Member

@bryango bryango commented Feb 6, 2024 •
edited
Loading

Based on: #286505
First proposed in: tectonic-typesetting/tectonic#1132 (comment)

Wraps tectonic with a locked web bundle to ensure reproducibility & compatibility with biber.

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

@ofborg ofborg bot requested review from doronbehar and lluchs February 6, 2024 03:53
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Feb 6, 2024
@bryango
Copy link
Member Author

bryango commented Feb 6, 2024 •
edited
Loading

Result of nixpkgs-review pr 286615 run on x86_64-linux

2 packages built:
  • tectonic
  • tectonic-unwrapped

Result of nixpkgs-review pr 286615 run on x86_64-darwin

2 packages built:
  • tectonic
  • tectonic-unwrapped

An online tectonic compile test is successfully triggered by ofborg: https://github.com/NixOS/nixpkgs/pull/286615/checks?check_run_id=21256112349 and passes with no issue.

@bryango bryango marked this pull request as ready for review February 6, 2024 03:56
@bryango bryango mentioned this pull request Feb 6, 2024
Closed
13 tasks
doronbehar
doronbehar requested changes Feb 6, 2024
View reviewed changes
@bryango bryango force-pushed the tectonic-lock-bundle branch from bb2b3fd to 68ca4db Compare February 6, 2024 09:35
@bryango
Copy link
Member Author

bryango commented Feb 6, 2024 •
edited
Loading

Done! Waiting for OfBorg and my nixpkgs-review!

Update: fixed some minor typos in the comments.

@bryango bryango requested a review from doronbehar February 6, 2024 09:39
@bryango bryango force-pushed the tectonic-lock-bundle branch from 68ca4db to e7705c3 Compare February 6, 2024 09:42
@bryango @doronbehar
tectonic: wrap with a correct --web-bundle
771e06e 
Co-authored-by: Doron Behar <doron.behar@gmail.com>
@bryango bryango force-pushed the tectonic-lock-bundle branch from e7705c3 to 51e0a51 Compare February 6, 2024 09:44
@doronbehar
Copy link
Contributor

What changed in the last push?

@ofborg ofborg bot requested a review from doronbehar February 6, 2024 10:07
@bryango
Copy link
Member Author

bryango commented Feb 6, 2024 •
edited
Loading

What changed in the last push?

Oh hey, sorry, I spotted some typos in the comments around here and fixed it:

https://github.com/NixOS/nixpkgs/pull/286615/files#diff-e963f4747faeb7832a0d155195f5e4e42ee375cc75dfacca6aecb3aa3786a6ebR36-R42

It is trivial (no nix expressions are changed).

Update: Result of nixpkgs-review pr 286615 run on x86_64-linux

2 packages built:
  • tectonic
  • tectonic-unwrapped

Result of nixpkgs-review pr 286615 run on x86_64-darwin

2 packages built:
  • tectonic
  • tectonic-unwrapped

Update: oh no, there is a bundle.url -> bundleUrl in passthru.tests.workspace that I missed... I will have to force push again, hopefully that would be all! @doronbehar

@bryango bryango force-pushed the tectonic-lock-bundle branch from 51e0a51 to 37b6565 Compare February 6, 2024 10:22
@bryango
tectonic: add passthru.tests.workspace
98a319b 
Also, replace `builtins.toFile` with `pkgs.writeText` because the former
blocks the evaluation loop just like an import from derivation (IFD).
Although it is _technically_ not an IFD, it has very similar effects,
and thus we should prefer the nixpkgs `pkgs.writeText` instead.
@bryango bryango force-pushed the tectonic-lock-bundle branch from 37b6565 to 98a319b Compare February 6, 2024 10:23
@doronbehar doronbehar merged commit 17710c7 into NixOS:master Feb 6, 2024
22 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lluchs lluchs Awaiting requested review from lluchs

@doronbehar doronbehar Awaiting requested review from doronbehar

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bryango @doronbehar @Mastermindaxe