Skip to content

Conversation

TomaSajt
Copy link
Contributor

@TomaSajt TomaSajt commented May 14, 2025

Both packages had a Cargo.lock file different from the one found in src.
They were changed to fix build issues.

In this PR I made .patch files from the differences of the vendored file and the one in src and applied them via cargoPatches.

After this, I was able to remove the vendored Cargo.lock and just use the patches, because the cargoHash's underlying mechanism (fetchCargoVendor) supports git dependencies now.

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.

@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 May 14, 2025
@nix-owners nix-owners bot requested a review from fgaz May 14, 2025 23:37
@TomaSajt TomaSajt changed the title {crabfit-api,fedigroups}: use patch instead of vendoring Cargo.lock {crabfit-api,fedigroups,rustdesk}: use patch instead of vendoring Cargo.lock May 19, 2025
@nix-owners nix-owners bot requested review from ocfox and Leixb May 19, 2025 13:19
@Aleksanaa Aleksanaa added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 18, 2025
@fgaz
Copy link
Member

fgaz commented Jun 23, 2025

fedigroups done in #417276

@TomaSajt TomaSajt changed the title {crabfit-api,fedigroups,rustdesk}: use patch instead of vendoring Cargo.lock {crabfit-api,rustdesk}: use patch instead of vendoring Cargo.lock Jun 24, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 24, 2025
@github-actions github-actions bot added the 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. label Jun 24, 2025
@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 13, 2025
@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 15, 2025
Copy link
Contributor

@gepbird gepbird left a comment

Choose a reason for hiding this comment

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

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 407198
Commit: 960278abc169d5b6451da12b2037f824465dcf62


x86_64-linux

✅ 2 packages built:
  • crabfit-api
  • rustdesk

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Aug 15, 2025
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-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants