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

rssguard: 4.5.3 -> 4.8.1 #367224

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

rssguard: 4.5.3 -> 4.8.1 #367224

wants to merge 2 commits into from

Conversation

tebriel
Copy link
Contributor

@tebriel tebriel commented Dec 21, 2024 •
edited
Loading

Updates from QT5->QT6 and feature updates
https://github.com/martinrotter/rssguard/releases/tag/4.8.1

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.

@tebriel tebriel marked this pull request as ready for review December 21, 2024 22:21
@lucasew
Copy link
Contributor

lucasew commented Dec 21, 2024

Please format the code. The workflow has the instructions.

@lucasew
Copy link
Contributor

lucasew commented Dec 21, 2024

Tebriel maintainer is not in the list

Did you add your name to https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix?

@github-actions github-actions bot added the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label Dec 22, 2024
@tebriel
Copy link
Contributor Author

tebriel commented Dec 22, 2024

@lucasew thanks for the pointers, both taken care of!

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 22, 2024
@lucasew
Copy link
Contributor

lucasew commented Dec 22, 2024

@lucasew thanks for the pointers, both taken care of!

Can you put the part you add your user to another commit?

This is kinda a trivial case so a git reset --soft HEAD~1 can remove the commit and make stuff staged, you git restore --staged the package file leaving only the maintainer list code staged, commit the first, git add -A, commit the second, then git push --force because it has now a diverging commit tree.

@ofborg ofborg bot requested a review from jluttine December 22, 2024 17:32
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-linux: 1 labels Dec 22, 2024
@tebriel
Copy link
Contributor Author

tebriel commented Jan 2, 2025

@lucasew still learning the flow, maintainers: add tebriel is now a separate commit as is adding tebriel to the rssguard app to keep things very distinct!

@lucasew
Copy link
Contributor

lucasew commented Jan 2, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 367224

x86_64-linux

✅ 1 package built:
  • rssguard

@tebriel tebriel mentioned this pull request Jan 2, 2025
Draft
13 tasks
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 4, 2025
@github-actions github-actions bot removed the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label Jan 7, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 7, 2025
@lucasew
Copy link
Contributor

lucasew commented Jan 7, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 367224

x86_64-linux

✅ 1 package built:
  • rssguard

@pbsds
Copy link
Member

pbsds commented Jan 8, 2025

Please rebase your work rather than merge from master

@tebriel
Copy link
Contributor Author

tebriel commented Jan 8, 2025

@pbsds done! I'll learn the nixpkgs git flow eventually!

@pbsbot
Copy link

pbsbot commented Jan 9, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 367224

x86_64-linux

✅ 1 package built:
  • rssguard

pbsds
pbsds reviewed Jan 9, 2025
View reviewed changes
Copy link
Member

@pbsds pbsds left a comment

Choose a reason for hiding this comment

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

LGTM, just some final nits :)

pkgs/applications/networking/feedreaders/rssguard/default.nix Outdated Show resolved Hide resolved
pkgs/applications/networking/feedreaders/rssguard/default.nix Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pbsds pbsds pbsds left review comments

@jluttine jluttine Awaiting requested review from jluttine

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tebriel @lucasew @pbsds @pbsbot @wegank