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

yofi: fix build #344811

Merged
merged 1 commit into from
Oct 14, 2024
Merged

yofi: fix build #344811

merged 1 commit into from
Oct 14, 2024

Conversation

ocfox
Copy link
Member

@ocfox ocfox commented Sep 27, 2024

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.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 a review from RaySlash September 27, 2024 06:13
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Sep 27, 2024
pkgs/by-name/yo/yofi/Cargo.lock Outdated Show resolved Hide resolved
@getchoo getchoo added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 5, 2024
@RaySlash
Copy link
Member

RaySlash commented Oct 5, 2024

Hey @ocfox , I believe it would be easier to follow the upstream repo changes rather than making a patch yourselves. You can update the rev of yofi itself as the time crate issue has been fixed upstream. As there is no official release, you could name it unstable-05102024 for example.

@ocfox
Copy link
Member Author

ocfox commented Oct 5, 2024

Maybe patch cargo.lock more cleaner?

Copy link
Member

@getchoo getchoo left a comment

Choose a reason for hiding this comment

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

Ah didn't realize this was a patch from a fork; we probably shouldn't be using it then

l4l/yofi@09901e7 would be a better candidate. I'd recommend continuing to pull it in as a patch though, since unstable versions can introduce issues we don't intend

@ocfox
Copy link
Member Author

ocfox commented Oct 5, 2024

l4l/yofi@09901e7 would be a better candidate. I'd recommend continuing to pull it in as a patch though, since unstable versions can introduce issues we don't intend

I just realized that I tried, because of flake.nix caused the patch to fail, so I used a fork commit.

@Aleksanaa Aleksanaa merged commit 6df2210 into NixOS:master Oct 14, 2024
27 checks passed
@ocfox ocfox deleted the yofi branch October 14, 2024 08:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants