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

iroh: 0.11 -> 0.12 #276099

Closed
wants to merge 3 commits into from
Closed

Conversation

crimeminister
Copy link
Contributor

@crimeminister crimeminister commented Dec 22, 2023

Description of changes

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.

@crimeminister
Copy link
Contributor Author

An error compiling a dependency is currently blocking:

error: couldn't read /build/iroh-0.12.0-vendor.tar.gz/watchable/src/.crate-docs.md: No such file or directory (os error 2)
 --> /build/iroh-0.12.0-vendor.tar.gz/watchable/src/lib.rs:1:10
  |
1 | #![doc = include_str!(".crate-docs.md")]
  |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@cameronfyfe
Copy link
Contributor

cameronfyfe commented Dec 29, 2023

An error compiling a dependency is currently blocking:

error: couldn't read /build/iroh-0.12.0-vendor.tar.gz/watchable/src/.crate-docs.md: No such file or directory (os error 2)
 --> /build/iroh-0.12.0-vendor.tar.gz/watchable/src/lib.rs:1:10
  |
1 | #![doc = include_str!(".crate-docs.md")]
  |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

It looks like .crate-docs.md in this watchable crate used by v0.12.0 for some reason gets filtered out by the rustPlatform.fetchCargoTarball logic which calls cargo vendor (I ran cargo vendor manually for watchable and that .crate-docs.md file is missing in the resulting vendored folder). .crate-docs.md is in the published package for watchable though and since rustPlatform.importCargoLock doesn't use cargo vendor the build seems to work if you switch to that. It's also nice to switch to this so a hash for the dependencies doesn't need to be manually specified anymore. Putting working code in separate comment.

Co-authored-by: Cameron <cameron.j.fyfe@gmail.com>
@cameronfyfe
Copy link
Contributor

@crimeminister I forgot that you're not allowed to import from derivation so the lockFile = "${src}/Cargo.lock" I recommended is not allowed. You can remedy this by copying and commiting the whole Cargo.lock file here (this is what other people are doing) or you can wait until the root issue is fixed in the next version of iroh and go back to specifying cargoHash (I submitted this PR n0-computer/iroh#1932).

@crimeminister
Copy link
Contributor Author

not allowed. You can remedy this by copying an

Thanks so much for your investigation @cameronfyfe. I'll include the Cargo.lock file for now, and track the progress of your PR with the plan of sending another update for the next version, assuming you don't get there first.

@crimeminister crimeminister marked this pull request as ready for review January 27, 2024 04:35
@ofborg ofborg bot requested a review from cameronfyfe January 27, 2024 04:56
Copy link
Contributor

@cameronfyfe cameronfyfe left a comment

Choose a reason for hiding this comment

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

Works on my machine (x86-linux)

@crimeminister
Copy link
Contributor Author

@cameronfyfe Is there another step to getting this PR reviewed and/or merged? Thanks.

@cameronfyfe
Copy link
Contributor

@crimeminister Just need to wait for someone with commit rights to approve/merge it, I can only approve it. Sometimes takes a bit. If you want it soon you can try to find someone to request review from or post about it in a forum and hope someone sees it.

@crimeminister
Copy link
Contributor Author

@crimeminister Just need to wait for someone with commit rights to approve/merge it, I can only approve it. Sometimes takes a bit. If you want it soon you can try to find someone to request review from or post about it in a forum and hope someone sees it.

Thanks @cameronfyfe. I am in no particular rush, I just wanted to make sure I wasn't missing a step in the process on my end.

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Mar 8, 2024
@crimeminister crimeminister mentioned this pull request Mar 25, 2024
13 tasks
@wegank
Copy link
Member

wegank commented Apr 13, 2024

Done in #299006.

@wegank wegank closed this Apr 13, 2024
@crimeminister crimeminister deleted the update-iroh branch April 13, 2024 23:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants