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.

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

gpgme: fix cross, drop python2 #226123

Merged
merged 1 commit into from Apr 15, 2023
Merged

gpgme: fix cross, drop python2 #226123

merged 1 commit into from Apr 15, 2023

Conversation

ghost
Copy link

@ghost ghost commented Apr 14, 2023

This package very confusingly takes both python(2) and python3 as
arguments, and then mixes them up via an overlay in python-packages.
Since python2 is now marked INSECURE, let's just stick with python3.

Also fixes cross compilation.

@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Apr 14, 2023
@ofborg ofborg bot requested a review from dotlambda April 14, 2023 07:34
@@ -51,12 +50,16 @@ stdenv.mkDerivation rec {
pkg-config
texinfo
] ++ lib.optionals pythonSupport [
buildPackages.python3
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this be in depsBuildBuild instead then?

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, it's not spliced :/

Copy link
Author

Choose a reason for hiding this comment

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

I think the whole splicing thing needs to be rethought/redone.

@dotlambda
Copy link
Member

takes both python(2) and python3

It takes null because python is an alias or maybe not even that anymore.

@ghost ghost requested a review from dotlambda April 14, 2023 17:29
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

Please squash.

This package very confusingly takes both python(2) and python3 as
arguments, and then mixes them up via an overlay in python-packages.
Since python2 is now marked INSECURE, let's just stick with python3.

Also fixes cross compilation.
@ghost ghost requested a review from dotlambda April 14, 2023 18:33
@ghost
Copy link
Author

ghost commented Apr 14, 2023

Please squash.

Done.

@dotlambda dotlambda merged commit b564f80 into NixOS:master Apr 15, 2023
@ghost ghost deleted the pr/fixcross/gpgme branch April 15, 2023 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants