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
electrum: 3.2.4 -> 3.3.2 plus new dependencies. #54417
Conversation
@GrahamcOfBorg build electrum |
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.
Please be more specific. |
The descriptions, attribute names and |
@@ -5193,6 +5195,8 @@ in { | |||
|
|||
casttube = callPackage ../development/python-modules/casttube { }; | |||
|
|||
aiorpcX = callPackage ../development/python-modules/aiorpcX { }; |
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 should be sorted alphabetically - at least to some degree.
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.
From https://github.com/romis2012/aiohttp-socks:
Python >= 3.5.3
From https://github.com/kyuupichan/aiorpcX:
Python (>= 3.6)
@@ -14,14 +14,17 @@ in | |||
|
|||
python3Packages.buildPythonApplication rec { | |||
name = "electrum-${version}"; |
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.
name = "electrum-${version}"; | |
pname = "electrum"; |
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 still needs to be changed.
Should this version be backported or is our current stable version fine (i.e. it does not break with other clients of the network)? |
Do you want
Do you mean meta.description? That's there. What's "attribute names"? pnames need to be changed to what? They seem to fall in-line with what's already there. Do you mean the name/pname switch electrum? Why do you ask me to do that for electrum? It's already there, and breaks with the rule of "Don't ask for random unrelated clean-ups in PR".
Not going to add myself as maintainer. I apologize to add to the prior art of 1000 default.nix files under python-modules that has no maintainer.
@Mic92 No backport required, imho. 3.2.4 addresses the security issues that 3.3.2 addresses as well. |
Yes, Attribute names are the ones in |
953f6f9
to
25b468c
Compare
I have added that.
Wait, did you just take 3 message to tell me indirectly also via me reading a two-page PEP, that this should be aiohttp-socks instead of aiohttp_socks? I am used to a more welcoming and cooperating approach here on NixOS/nixpkgs. I like to apologize on your behalf for massively wasting my time. I hope that you are having a better day tomorrow. @Mic92 From my side the review is complete and this is ready to be merged. |
Think about it the other way round: Would you have read https://nixos.org/nixpkgs/manual/#python before touching Python packages, I wouldn't have had to tell you to read it. |
@@ -14,14 +14,17 @@ in | |||
|
|||
python3Packages.buildPythonApplication rec { | |||
name = "electrum-${version}"; |
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 still needs to be changed.
{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: | ||
|
||
buildPythonPackage rec { | ||
pname = "aiohttp_socks"; |
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.
pname = "aiohttp_socks"; | |
pname = "aiohttp-socks"; |
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.
You will have to add pname = "aiohttp_socks"
inside fetchPypi
.
{ lib, fetchPypi, buildPythonPackage, pythonOlder, attrs }: | ||
|
||
buildPythonPackage rec { | ||
pname = "aiorpcX"; |
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.
pname = "aiorpcX"; | |
pname = "aiorpcx"; |
@@ -5193,6 +5195,8 @@ in { | |||
|
|||
casttube = callPackage ../development/python-modules/casttube { }; | |||
|
|||
aiorpcX = callPackage ../development/python-modules/aiorpcX { }; |
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.
aiorpcX = callPackage ../development/python-modules/aiorpcX { }; | |
aiorpcx = callPackage ../development/python-modules/aiorpcx { }; |
disabled = pythonOlder "3.5.3"; | ||
|
||
meta = { | ||
description = "SOCKS proxy connector for aiohttp."; |
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.
description = "SOCKS proxy connector for aiohttp."; | |
description = "SOCKS proxy connector for aiohttp"; |
See https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes.
propagatedBuildInputs = [ attrs ]; | ||
|
||
meta = { | ||
description = "Transport, protocol and framing-independent async RPC client and server implementation."; |
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.
description = "Transport, protocol and framing-independent async RPC client and server implementation."; | |
description = "Transport, protocol and framing-independent async RPC client and server implementation"; |
That as helpful as "Read the library of congress", when it concerns such a small change. Thanks your suggested changes. Would you have been more clear on what was to change, I would have had the time to pick them up. Unfortunately, this PR has exceed the time that I had allocated for it. No, in all seriousness, you need to stop waste people's time with obscure guess-my-mind nitpicks. Closing. |
You do have a point regarding the Python packaging guide. That's too long if your only goal is to update some package. Sorry about that. Must have been my prejudice against anything Bitcoin-related. However, one could at least have expected you to read https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#submitting-changes since you ticked that box. |
Motivation for this change
Upstream release. https://github.com/spesmilo/electrum/releases
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)