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
pythonPackages.dkimpy: 0.6.2 -> 0.7.1 #34980
Conversation
, pytest, dnspython, pynacl, authres }: | ||
|
||
buildPythonApplication rec { | ||
name = "${pname}-${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.
no name
@@ -1,20 +1,20 @@ | |||
{ stdenv, fetchurl, openssl, makeWrapper, buildPythonApplication | |||
, pytest, dnspython }: | |||
, pytest, dnspython, pynacl, authres, python }: | |||
|
|||
buildPythonApplication rec { | |||
name = "${pname}-${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.
Please get rid of name
. It is not needed any more.
for f in $out/bin/*; do | ||
wrapProgram $f --prefix PYTHONPATH ":" $out/${python.sitePackages}/ | ||
done | ||
popd |
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.
Why were these executables renamed in the first place? Is this done in other distributions too?
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.
@dotlambda: The man pages refer to dkimverify etc, so that is the rationale...
Authenticated Recieved Chain (ARC) (draft-ietf-dmarc-arc-protocol-08) | ||
''; | ||
homepage = https://launchpad.net/authentication-results-python; | ||
license = licenses.apl2; |
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.
licenses.asl20
All comments processed. |
8f70a17
to
c4915c5
Compare
sha256 = "1crdff9wa4cma6p4a6ldiffa6c3awxafnv4d207h6z6msc3jb868"; | ||
}; | ||
|
||
buildInputs = [ pytest ]; |
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.
checkInputs
?
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 had not come across that, but that is completely logical.
url = "https://launchpad.net/${pname}/${majorversion}/${majorversion}.${minorversion}/+download/${name}.tar.gz"; | ||
sha256 = "1hagz8qk0v4ijfbcdq4z28bpgr2mkpr498z76i1vam2d50chmakl"; | ||
url = "https://launchpad.net/${pname}/${majorversion}/${majorversion}.${minorversion}/+download/${pname}-${version}.tar.gz"; | ||
sha256 = "13ds5f4vvaq63hnrglficqjpgcfxhzpcbkxhj7gbp51qilh8gqqh"; | ||
}; | ||
|
||
buildInputs = [ pytest ]; |
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.
checkInputs
?
4548bb8
to
58cf8e2
Compare
buildPythonApplication rec { | ||
pname = "authres"; | ||
majorversion = "1.0"; | ||
minorversion = "1"; |
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.
these two are not parameters of buildPythonApplication
and thus best moved into a let ... in
expression.
majorversion = "0.6"; | ||
minorversion = "2"; | ||
majorversion = "0.7"; | ||
minorversion = "0"; |
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.
same here
Moved version numbers to let statements for both packages. |
let | ||
majorversion = "0.7"; | ||
minorversion = "0"; | ||
in | ||
|
||
buildPythonApplication rec { |
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.
Could you please change this to buildPythonPackage
minorversion = "1"; | ||
in | ||
|
||
buildPythonApplication rec { |
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.
buildPythonPackage
pname = "authres"; | ||
version = "${majorversion}.${minorversion}"; | ||
|
||
src = fetchurl { |
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 use fetchPypi
if possible
|
||
let | ||
majorversion = "1.0"; | ||
minorversion = "1"; |
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.
1.0.2 has been released: https://pypi.org/project/authres/
pname = "dkimpy"; | ||
majorversion = "0.6"; | ||
minorversion = "2"; | ||
version = "${majorversion}.${minorversion}"; | ||
|
||
src = fetchurl { |
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.
fetchPypi
if possible
@leenaars Any progress? |
@dotlambda: I upgraded both packages to current version (very rapid pace) and made the rest of the modifications. |
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 replace python test.py
by ${python.interpreter} test.py
.
mv dkimverify.py dkimverify | ||
mv dknewkey.py dknewkey | ||
for f in $out/bin/*; do | ||
wrapProgram $f --prefix PYTHONPATH ":" $out/${python.sitePackages}/ |
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.
Is this wrapping necessary? The binaries should be wrapped by default.
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 removed it.
sha256 = "1mcllhrwr23hwa2jn3m15k29ks1205ymwafjzchh8ma664hnzv6v"; | ||
}; | ||
|
||
checkInputs = [ pytest ]; |
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.
Ran 0 tests in 0.000s
You might need to specify an appropriate checkPhase
.
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.
@leenaars It should be
checkInputs = [ ];
checkPhase = ''
# run doctests
python -m authres
'';
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 tried, but the checks are WIP. I cannot see how they should currently work. I suggest leaving as is.
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.
Well, they work if you use what I wrote above.
@dotlambda: All your suggestions processed. Anything else? |
RFC 7293 The Require-Recipient-Valid-Since Header Field | ||
RFC 7489 Domain-based Message Authentication, Reporting, and Conformance (DMARC) | ||
Authenticated Recieved Chain (ARC) (draft-ietf-dmarc-arc-protocol-08) | ||
''; |
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.
indentation
@GrahamcOfBorg build python2.pkgs.dkimpy python3.pkgs.dkimpy |
Failure on x86_64-linux (full log) Attempted: python2.pkgs.dkimpy, python3.pkgs.dkimpy Partial log (click to expand)
|
Failure on aarch64-linux (full log) Attempted: python2.pkgs.dkimpy, python3.pkgs.dkimpy Partial log (click to expand)
|
Closing in favor of #43219. |
Motivation for this change
Version bump of dkimpy with new dependency (authres) packaged.
Things done
build-use-sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)