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

spotube: 3.8.3 → 3.9.0 | add aarch64-linux support. #368631

Merged
merged 2 commits into from
Dec 31, 2024

Conversation

damidoug
Copy link
Contributor

@damidoug damidoug commented Dec 27, 2024

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.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Dec 27, 2024
@ofborg ofborg bot requested a review from TomaSajt December 27, 2024 22:52
@damidoug damidoug mentioned this pull request Dec 29, 2024
13 tasks
@github-actions github-actions bot added the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label Dec 29, 2024
Copy link
Contributor

@TomaSajt TomaSajt left a comment

Choose a reason for hiding this comment

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

old -> new should be used instead of old > new according to the commit conventions for version updates.

Also, please put the maintainer list commit before the main commit.

one way to do this: git rebase -i HEAD~2 and swap the two commits

@ofborg ofborg bot requested a review from TomaSajt December 29, 2024 15:23
@damidoug damidoug changed the title spotube: 3.8.3 > 3.9.0 | add aarch64-linux support. spotube: 3.8.3 -> 3.9.0 | add aarch64-linux support. Dec 30, 2024
@damidoug damidoug changed the title spotube: 3.8.3 -> 3.9.0 | add aarch64-linux support. spotube: 3.8.3 → 3.9.0 | add aarch64-linux support. Dec 30, 2024
pkgs/by-name/sp/spotube/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/sp/spotube/package.nix Outdated Show resolved Hide resolved
@TomaSajt
Copy link
Contributor

Please drop the unrelated commits
(Remove the lines when doing rebase -i)

@damidoug
Copy link
Contributor Author

@TomaSajt you're saying about these commits from others in others files? I don't know why is showing it, when I use git rebase -I just have one line uncommented wrote "noop".

noop

# Rebase d836dc6ebf98..d836dc6ebf98 onto d836dc6ebf98 (1 command)
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
#                    commit's log message, unless -C is used, in which case
#                    keep only this commit's message; -c is same as -C but
#                    opens the editor
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
#         create a merge commit using the original merge commit's
#         message (or the oneline, if no original merge commit was
#         specified); use -c <commit> to reword the commit message
# u, update-ref <ref> = track a placeholder for the <ref> to be updated
#                       to this position in the new commits. The <ref> is
#                       updated at the end of the rebase
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
~                                                              

I'm starting to use git and GitHub for PRs, so sorry if i'm doing something wrong.

@TomaSajt
Copy link
Contributor

TomaSajt commented Dec 30, 2024

When doing git rebase -i HEAD~5 the last 5 commits will be edited. In this case you edited the last 5 commits, but you only needed to edit the last 2, so the 3 extra commits got "edited" as well (even if nothing changed). You can remove those 3 commits by doing git rebase -i HEAD~5
This will appear:

pick 7b04c187df57 sfeed: 2.0 -> 2.1
pick e0d47e630c1d sfeed: modernize
pick 24f0766aca08 distribution: 3.0.0-rc.1 -> 3.0.0-rc.2
pick 418aa56d8859 maintainers: add damidoug
pick 6384c3751edb spotube: 3.8.3 → 3.9.0 | add aarch64-linux support

You will need to drop the 3 unneeded commits.

you either have to remove the unneeded commits:

pick 418aa56d8859 maintainers: add damidoug
pick 6384c3751edb spotube: 3.8.3 → 3.9.0 | add aarch64-linux support

or you have to write drop instead of pick

drop 7b04c187df57 sfeed: 2.0 -> 2.1
drop e0d47e630c1d sfeed: modernize
drop 24f0766aca08 distribution: 3.0.0-rc.1 -> 3.0.0-rc.2
pick 418aa56d8859 maintainers: add damidoug
pick 6384c3751edb spotube: 3.8.3 → 3.9.0 | add aarch64-linux support

If you accidentally start rebasing more than what you need you can cancel the rebase by deleting all of the text.

Copy link
Contributor

@TomaSajt TomaSajt left a comment

Choose a reason for hiding this comment

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

LGTM :)

@wegank wegank added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Dec 31, 2024
@ofborg ofborg bot requested a review from TomaSajt December 31, 2024 10:05
@drupol drupol merged commit 13c6983 into NixOS:master Dec 31, 2024
44 of 45 checks passed
@eljamm eljamm mentioned this pull request Jan 2, 2025
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants