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.

Sign up for GitHub

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

Jump to bottom

python3Packages.sslyze: 3.1.0 -> 4.1.0 #122175

Merged
merged 4 commits into from May 8, 2021
Merged

python3Packages.sslyze: 3.1.0 -> 4.1.0 #122175

merged 4 commits into from May 8, 2021

Conversation

veehaitch
Copy link
Member

Motivation for this change

ZHF: #122042

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@veehaitch
Copy link
Member Author

Result of nixpkgs-review pr 122175 run on x86_64-linux 1

6 packages built:
  • python38Packages.nassl
  • sslyze (python38Packages.sslyze)
  • python38Packages.tls-parser
  • python39Packages.nassl
  • python39Packages.sslyze
  • python39Packages.tls-parser

@r-rmcgibbo
Copy link

r-rmcgibbo commented May 8, 2021 •
edited

Result of nixpkgs-review pr 122175 at 6a8db92e run on x86_64-linux 1

6 packages built successfully:
  • python38Packages.nassl
  • sslyze (python38Packages.sslyze)
  • python38Packages.tls-parser
  • python39Packages.nassl
  • python39Packages.sslyze
  • python39Packages.tls-parser
2 suggestions:
  • warning: unclear-gpl

    agpl3 is a deprecated license, please check if project uses agpl3Plus or agpl3Only and change meta.license accordingly.

    Near pkgs/development/python-modules/sslyze/default.nix:52:5:

       |
52 |     license = licenses.agpl3;
   |     ^
  • warning: unclear-gpl

    agpl3 is a deprecated license, please check if project uses agpl3Plus or agpl3Only and change meta.license accordingly.

    Near pkgs/development/python-modules/nassl/default.nix:132:5:

        |
132 |     license = licenses.agpl3;
    |     ^

Result of nixpkgs-review pr 122175 at 6a8db92e run on aarch64-linux 1

4 packages failed to build:
2 packages built successfully:
  • python38Packages.tls-parser
  • python39Packages.tls-parser
2 suggestions:
  • warning: unclear-gpl

    agpl3 is a deprecated license, please check if project uses agpl3Plus or agpl3Only and change meta.license accordingly.

    Near pkgs/development/python-modules/sslyze/default.nix:52:5:

       |
52 |     license = licenses.agpl3;
   |     ^
  • warning: unclear-gpl

    agpl3 is a deprecated license, please check if project uses agpl3Plus or agpl3Only and change meta.license accordingly.

    Near pkgs/development/python-modules/nassl/default.nix:132:5:

        |
132 |     license = licenses.agpl3;
    |     ^

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement. Does something look off? Please file an issue or reach out on IRC.

dotlambda
dotlambda requested changes May 8, 2021
View reviewed changes
pkgs/development/python-modules/nassl/default.nix Show resolved Hide resolved
pkgs/development/python-modules/nassl/default.nix Outdated
Comment on lines 83 to 106
postPatch =
let
legacyOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslLegacyStatic.version;
modernOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslStatic.version;
zlibVersion = zlibStatic.version;
in
''
mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
cp ${opensslLegacyStatic.out}/lib/libssl.a \
${opensslLegacyStatic.out}/lib/libcrypto.a \
deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include
ln -s ${opensslLegacyStatic.bin} deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps

mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/
cp ${opensslStatic.out}/lib/libssl.a \
${opensslStatic.out}/lib/libcrypto.a \
deps/openssl-OpenSSL_${modernOpenSSLVersion}/
ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include
ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps
mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/
cp ${opensslStatic.out}/lib/libssl.a \
${opensslStatic.out}/lib/libcrypto.a \
deps/openssl-OpenSSL_${modernOpenSSLVersion}/
ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include
ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps

mkdir -p deps/zlib-${zlibVersion}/
cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/
'';
mkdir -p deps/zlib-${zlibVersion}/
cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/
'';
Copy link
Member

Choose a reason for hiding this comment

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

I think we should minimize whitespace changes.

Copy link
Member Author

Choose a reason for hiding this comment

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

Reverted the formatting.

jonringer
jonringer reviewed May 8, 2021
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

otherwise LGTM

pkgs/development/python-modules/nassl/default.nix Outdated
Comment on lines 121 to 123
pytestFlagsArray = [
"-k"
"'not Online'"
];
Copy link
Contributor

Choose a reason for hiding this comment

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

This is the more succinct way to express this, but essentially does the same thing.

Suggested change
pytestFlagsArray = [
"-k"
"'not Online'"
];
disabledTests = [
"Online"
];

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the suggestion! Changed it accordingly 🙂

jonringer
jonringer approved these changes May 8, 2021
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 122175 run on x86_64-linux 1

6 packages built:
  • python38Packages.nassl
  • sslyze (python38Packages.sslyze)
  • python38Packages.tls-parser
  • python39Packages.nassl
  • python39Packages.sslyze
  • python39Packages.tls-parser

@jonringer jonringer merged commit f43b4c1 into NixOS:master May 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dotlambda dotlambda dotlambda requested changes

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@veehaitch @r-rmcgibbo @dotlambda @jonringer