animdl: init at 1.7.27 #240329
animdl: init at 1.7.27 #240329
Conversation
|
@Janik-Haag Also sorry for my PRs, they have been a little chaotic. I think I got it all sorted out though |
|
Huh? I did not change any endings. It's LF like it should be... |
No worries ^^
This time it's the last line in |
|
As this is actually a python package, I'd like to also request the review of the python team, which I can not tag directly and will therefore ping @mweinelt in person, as he is the only python team member I know from the top of my head… |
ofborg
bot
added
the
2.status: merge conflict
|
How do you reckon I fix this? I can't squash them |
|
You could soft-reset onto the base of your pull request and create new commits from there. ❯ git merge-base pr/240329 origin/master
3a4e234b072bd69e8901b8ed465be7bb659d1a93
❯ git reset --soft 3a4e234b072bd69e8901b8ed465be7bb659d1a93
❯ git status
On branch pr/240329
You are currently bisecting, started from branch '9e4e0807d214'.
(use "git bisect reset" to get back to the original branch)
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: maintainers/maintainer-list.nix
new file: pkgs/applications/video/animdl/default.nix
new file: pkgs/development/python-modules/anchor-kr/default.nix
new file: pkgs/development/python-modules/anitopy/default.nix
modified: pkgs/top-level/all-packages.nix
modified: pkgs/top-level/python-packages.nix
❯ git restore --staged .
❯ git status
On branch pr/240329
You are currently bisecting, started from branch '9e4e0807d214'.
(use "git bisect reset" to get back to the original branch)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: maintainers/maintainer-list.nix
modified: pkgs/top-level/all-packages.nix
modified: pkgs/top-level/python-packages.nix
Untracked files:
(use "git add <file>..." to include in what will be committed)
pkgs/applications/video/animdl/
pkgs/development/python-modules/anchor-kr/
pkgs/development/python-modules/anitopy/
no changes added to commit (use "git add" and/or "git commit -a")From here you can A more advanced alternative would be an interactive rebase, but it is a bit more involved. |
|
Upstream is not tagging their release. |
There was a problem hiding this comment.
Please make sure:
- You have on commit for adding yourself to the maintainers
- one commit per "package" created
- Having each of them named and described appropriately as explained in CONTRIBUTING.md
- Have a comment in your nix file that explains the hardcoded sha1 rather than a tag with a link to the upstream ticket
|
Do you mind if I just make a new branch for this? I'm trying to figure out how to remove all of the old commits and I cannot manage to do it... |
|
you can do |
|
There we go. Only the 4 needed commits. |
|
Updated with the requests. |
|
Trailing whitespace? This was never an issue before. |
ofborg
bot
removed
the
2.status: merge conflict
Then you just didn't have any before ;)
|
|
Not sure how that managed to get there but it should be all good now. |
eclairevoyant
added
the
12.approvals: 1
PassiveLemon
force-pushed
the
animdl-pr
branch
from
ef32b1a to
3bf65b5
Compare
PassiveLemon
force-pushed
the
animdl-pr
branch
from
3bf65b5 to
956a1ff
Compare
|
Updated with changes and rebased. |
PassiveLemon
force-pushed
the
animdl-pr
branch
2 times, most recently
from
d83cdee to
928d733
Compare
|
It now builds fine without needing to mess with the dependencies so I removed those bits. |
There was a problem hiding this comment.
looks good to me except for this two missing attributes. @NobbZ can you take another look before we can hopefully get this merged in the next few days?
PassiveLemon
force-pushed
the
animdl-pr
branch
from
928d733 to
4f082c4
Compare
|
Result of 10 packages built:
|
|
I'm seeing some new change where packages are being located by name. Would you like me to update this PR? |
|
Nah it's fine if you rebase, there will be a pr moving all the packages that can be moved to pkgs/by-name with a script, no need to do it manually. Sorry I forgot to merge this PR 🙈 |
|
Okay, I will rebase then |
|
Done |
PassiveLemon
force-pushed
the
animdl-pr
branch
from
4f082c4 to
6be18c3
Compare
|
@NobbZ can you also give you review again, merge is currently blocked because you requested some changes |
|
Result of 10 packages built:
|
|
Result of 8 packages built:
|
Description of changes
Adds Animdl, a cli scraper/downloader/streamer.
Adds Anchor, a Python library for scraping.
Adds Anitopy, a Python library for parsing anime video filenames.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)