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

cargo-gra: init at 0.6.0; karlender: 0.9.2 -> 0.10.4, refactor #353793

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

cargo-gra: init at 0.6.0; karlender: 0.9.2 -> 0.10.4, refactor #353793

wants to merge 6 commits into from
+73 −22

Conversation

Bot-wxt1221
Copy link
Member

@Bot-wxt1221 Bot-wxt1221 commented Nov 5, 2024 •
edited
Loading

ZHF: #352882

We need cargo-gra for build.

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.

@Bot-wxt1221 Bot-wxt1221 marked this pull request as draft November 5, 2024 11:09
@Bot-wxt1221 Bot-wxt1221 mentioned this pull request Nov 5, 2024
Closed
13 tasks
@Bot-wxt1221 Bot-wxt1221 force-pushed the karlender branch 2 times, most recently from 899f7cf to efa667c Compare November 5, 2024 11:47
@Bot-wxt1221 Bot-wxt1221 marked this pull request as ready for review November 5, 2024 12:12
@gepbird gepbird added the 0.kind: ZHF Fixes Fixes during the ZHF campaign label Nov 5, 2024
@gepbird
Copy link
Contributor

gepbird commented Nov 5, 2024

Related: #332957

gepbird
gepbird approved these changes Nov 5, 2024
View reviewed changes
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.

Changes LGTM, tested on x86_64-linux!

Maybe it would be easier to keep the cargo-gra init commit in this PR and close #353801?

Yesterday I also attempted to fix it in https://github.com/gepbird/nixpkgs/tree/karlender-fix-build but didn't have time to skip the problematic test and submit it.

I upstreamed this patch in https://gitlab.com/floers/calendar-stuff/karlender/-/merge_requests/43.

@gepbird
Copy link
Contributor

gepbird commented Nov 5, 2024

Superseeds #242295

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Nov 5, 2024
@ofborg ofborg bot requested a review from chuangzhu November 5, 2024 18:33
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 5, 2024
@Bot-wxt1221
Copy link
Member Author

ofborg fails because of cargo-gra. Menthion that we should merge it after #353801

@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 5, 2024
@Bot-wxt1221
Copy link
Member Author

I actually only rename meta.platform to meta.platforms. It is only a typo fix.

@Bot-wxt1221 Bot-wxt1221 changed the title karlender: 0.9.2 -> 0.10.4 cargo-gra: init at 0.6.0; karlender: 0.9.2 -> 0.10.4, refactor Nov 6, 2024
@Bot-wxt1221
Copy link
Member Author

@gepbird Please review this again. Now I just simply apply patch from your PR.

@Bot-wxt1221
Copy link
Member Author

@ofborg build karlender

gepbird
gepbird suggested changes Nov 6, 2024
View reviewed changes
pkgs/by-name/ka/karlender/package.nix Outdated Show resolved Hide resolved
gepbird
gepbird approved these changes Nov 6, 2024
View reviewed changes
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.

Tested and changers LGTM, thanks!

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 6, 2024
@Bot-wxt1221
Copy link
Member Author

@chuangzhu Done.

@chuangzhu chuangzhu added 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Nov 6, 2024
@ofborg ofborg bot requested a review from chuangzhu November 6, 2024 12:16
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Nov 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gepbird gepbird gepbird approved these changes

@chuangzhu chuangzhu Awaiting requested review from chuangzhu

Assignees
No one assigned
Labels
0.kind: ZHF Fixes Fixes during the ZHF campaign 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Bot-wxt1221 @gepbird @chuangzhu @wegank