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.

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

tectonic-unwrapped, tectonic: fix build #333143

Merged
merged 1 commit into from
Aug 9, 2024

Conversation

bryango
Copy link
Member

@bryango bryango commented Aug 8, 2024

Description of changes

Add patch bumping the time crate, fix build with rust 1.80. See:

Upstream is slow on releases, so we need to patch it ourselves. cargoPatches is necessary for patching Cargo.lock; a naive list of patches won't do. This is documented in https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/rust.section.md.

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.11 Release Notes (or backporting 23.11 and 24.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.

@ofborg ofborg bot requested review from doronbehar and lluchs August 8, 2024 03:41
@bryango bryango force-pushed the tectonic-rust-1.80-fix branch 2 times, most recently from 2e4659f to 437a167 Compare August 8, 2024 04:13
@bryango bryango changed the title [NOT READY] [staging-next] tectonic-unwrapped, tectonic: fix build [staging-next] tectonic-unwrapped, tectonic: fix build Aug 8, 2024
@bryango bryango marked this pull request as ready for review August 8, 2024 04:38
pkgs/tools/typesetting/tectonic/default.nix Outdated Show resolved Hide resolved
pkgs/tools/typesetting/tectonic/default.nix Outdated Show resolved Hide resolved
@SuperSandro2000
Copy link
Member

Also it is easier if you target master if it still builds with the old rust.

@bryango bryango changed the base branch from staging-next to master August 8, 2024 12:38
@bryango bryango changed the title [staging-next] tectonic-unwrapped, tectonic: fix build tectonic-unwrapped, tectonic: fix build Aug 8, 2024
@bryango bryango marked this pull request as draft August 8, 2024 12:39
Add patch bumping the `time` crate, fix build with rust 1.80.
@bryango bryango marked this pull request as ready for review August 8, 2024 13:19
@bryango
Copy link
Member Author

bryango commented Aug 8, 2024

All fixed, cargoPatches works nicely, ofborg happy @SuperSandro2000 @doronbehar

@doronbehar doronbehar dismissed SuperSandro2000’s stale review August 9, 2024 11:35

The cargoPatches request is resolved

@doronbehar doronbehar merged commit 788ccaa into NixOS:master Aug 9, 2024
29 of 31 checks passed
wentasah added a commit to wentasah/nixpkgs that referenced this pull request Aug 15, 2024
Hash mismatch was caused by NixOS#333143.

The build error message contains:

    Validating consistency between /build/source/Cargo.lock and /build/texpresso-tonic-0.15.0-vendor.tar.gz/Cargo.lock
    2372d2371
    <  "time",
    2707c2706
    < version = "0.3.36"
    ---
    > version = "0.3.34"
    ...
    ERROR: cargoHash or cargoSha256 is out of date

Fixes NixOS#334648.
@wentasah wentasah mentioned this pull request Aug 15, 2024
13 tasks
NickHu pushed a commit that referenced this pull request Aug 16, 2024
Hash mismatch was caused by #333143.

The build error message contains:

    Validating consistency between /build/source/Cargo.lock and /build/texpresso-tonic-0.15.0-vendor.tar.gz/Cargo.lock
    2372d2371
    <  "time",
    2707c2706
    < version = "0.3.36"
    ---
    > version = "0.3.34"
    ...
    ERROR: cargoHash or cargoSha256 is out of date

Fixes #334648.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants