-
-
Notifications
You must be signed in to change notification settings - Fork 14.2k
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
jesec-rtorrent: 0.9.8-r15 -> 0.9.8-r16 #169236
Conversation
275e630
to
8ce3acc
Compare
@AndersonTorres I do wish there was some way we could clean up the usage of |
@@ -6,8 +6,10 @@ | |||
, gtest | |||
, libtorrent | |||
, ncurses | |||
, jsonRpcSupport ? true, nlohmann_json |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is no reason to split this line.
The reason for this is obvious: the first is a Boolean argument that controls the insertion of the second one as a dependency.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree, except for the fact that this was the result of running the file through nixpkgs-fmt -- no formatter will be able to know this (and if Nixpkgs is auto-formatted in the future, this will happen anyways).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was the only thing the formatter found? Six lines in a diff that worsens the legibility of a code?
And people ask why I don't like them...
Also formatters are not to be the last word. Machines are meant to help us, not us to help them.
@@ -6,8 +6,10 @@ | |||
, gtest | |||
, libtorrent | |||
, ncurses | |||
, jsonRpcSupport ? true, nlohmann_json |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was the only thing the formatter found? Six lines in a diff that worsens the legibility of a code?
And people ask why I don't like them...
Also formatters are not to be the last word. Machines are meant to help us, not us to help them.
The relevant snippet is jesec-rtorrent = recurseIntoAttrs
(callPackage ../tools/networking/p2p/jesec-rtorrent {
callPackage = newScope pkgs.jesec-rtorrent;
});
rtorrent-jesec = jesec-rtorrent.rtorrent;
libtorrent-jesec = jesec-rtorrent.libtorrent; If we just flip rtorrent-jesec with jesec-rtorrent, it should work fine. rtorrent-jesec = recurseIntoAttrs
(callPackage ../tools/networking/p2p/jesec-rtorrent {
callPackage = newScope pkgs.rtorrent-jesec;
});
jesec-rtorrent = rtorrent-jesec.rtorrent;
jesec-libtorrent = rtorrent-jesec.libtorrent; |
I still think this is confusing considering the set name and the exposed package names at top level are so similar. I don't think there's any better solution, though... |
@AndersonTorres Maybe we should consider reverting the addition of the package set/scope for the rtorrent and libtorrent variations? |
No problems to me. However, do not to put libtorrent inside |
8ce3acc
to
5fe5016
Compare
5fe5016
to
73ff43b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, waiting ofborg.
@ofborg eval |
2715bc0
to
0892af9
Compare
0892af9
to
b9e02e7
Compare
@AndersonTorres Should be good now -- OfBorg passes. I did add an extra commit though, please see that before merging. |
Description of changes
Things done
sandbox = true
set 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/
)nixos/doc/manual/md-to-db.sh
to update generated release notes