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

yoink: init at 0.5.0 #312119

Merged
merged 2 commits into from
Jun 3, 2024
Merged

yoink: init at 0.5.0 #312119

merged 2 commits into from
Jun 3, 2024

Conversation

hogcycle
Copy link
Contributor

Description of changes

https://github.com/MrMarble/yoink
yoink is an app designed to help you download torrents marked as free leech in order to mantain your ratio in private trackers.

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.05 Release Notes (or backporting 23.05 and 23.11 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.

Copy link
Member

@eclairevoyant eclairevoyant left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution!

Few points of feedback:

pkgs/applications/networking/p2p/yoink/default.nix Outdated Show resolved Hide resolved
pkgs/applications/networking/p2p/yoink/default.nix Outdated Show resolved Hide resolved
@hogcycle
Copy link
Contributor Author

Thanks for your feedback. I'll be sure to follow the commit guidelines closer going forward.

@hogcycle hogcycle changed the title MrMarble/yoink v0.5.0 intial commit MrMarble/yoink v0.5.0 initial commit May 16, 2024
@hogcycle hogcycle changed the title MrMarble/yoink v0.5.0 initial commit yoink: init at 0.5.0 May 16, 2024
@hogcycle
Copy link
Contributor Author

ok, that's that. sorry for the redundant and sloppy commits. still really unfamiliar with git and couldn't get squashing to work. it should be ready to go, of course after review.

pkgs/by-name/yo/yoink/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/yo/yoink/package.nix Outdated Show resolved Hide resolved
maintainers/maintainer-list.nix Outdated Show resolved Hide resolved
@RaghavSood
Copy link
Member

To fix your commit history, look into git rebase -i - then reorder them so that the add maintainer commit is first (just move the lines around in the resulting editor window), and squash them so you have two commits:

maintainers: add hogcycle
yoink: init at 0.5.0

@eclairevoyant
Copy link
Member

eclairevoyant commented May 17, 2024

git rebase -i should give open an editor window:

  • delete the lines you don't want to include (merge commits should be dropped)
  • keep the lines you do want to include (the two commits you intend to keep)
  • reorder the lines to reorder the commits. the first commit is at the top.
  • replace "pick" with "s" or "squash" to squash the commit into the previous line (this is useful for if you have changes across multiple commits that you want to combine into one big commit)
  • then save and exit the editor

A more detailed guide is available at https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History

@hogcycle
Copy link
Contributor Author

hogcycle commented May 17, 2024

Thanks. Trust me, I have like 20 tabs open with rebasing guides, but the history is all twisted up. I'd nuke and pave if that was an option. I haven't found a good way to have git rebase only list my commits, I'm getting a lot that aren't mine using git rebase -i HEAD~{n}. Also not getting any merge commits visible in there. I'll figure it out, I just went headlong into git.

I hope I'm not sending you emails with every one of these garbage commits 😅😅

@eclairevoyant
Copy link
Member

eclairevoyant commented May 18, 2024

I just use GH notifications, so I'm not getting any emails.

Anyway, if you're getting a lot of commits listed in the interactive rebase, what you can do here is go through the history using the website and pick out the commits that are relevant, ignoring everything else.

For example, for the maintainers commit, cbc6ca4 is the original commit, and the follow up commits are adac37f and 9f579bf.

As for the package itself, the proper init was in c1ac533, and the rename was in 1ab5ef0

Hence you could wipe out the file shown in the rebase editor, and just write

# maintainer commits
pick cbc6ca48a9edff7fdb788b14d2fca7dd3cdfd4e4
squash adac37fed57ce6c01b2b9ecbd3bb17a27efd4024
squash 9f579bf1976d123f317ffb3ff1d207284d8fb13b

# init commits
reword c1ac53356fc40d84035739a2b12f0a1779baf7ce
squash 1ab5ef0f05c4cd807c49e8cb0d2806f941355610

Once you do so, you can then fix the second commit's message (which is what reword will initiate for you) to yoink: init at 0.5.0

I'll mark it as draft for now, just to avoid any pings of other users, in case the rebase goes sideways.

@eclairevoyant eclairevoyant marked this pull request as draft May 18, 2024 00:19
@hogcycle
Copy link
Contributor Author

Ok, thanks. I'm pretty sure I was rebasing the rebase commit. It's a big mess lol. Thank you for guiding me through.

@hogcycle
Copy link
Contributor Author

Thank you so much. I was under the impression that every commit needed to be squashed, that seems to be where my troubles came from.

@hogcycle hogcycle marked this pull request as ready for review May 27, 2024 22:03
@hogcycle hogcycle requested a review from RaghavSood May 27, 2024 22:03
@hogcycle
Copy link
Contributor Author

hogcycle commented Jun 2, 2024

Good to merge?

@eclairevoyant eclairevoyant merged commit 0fc0a54 into NixOS:master Jun 3, 2024
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants