-
-
Notifications
You must be signed in to change notification settings - Fork 15.4k
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
Openssl mingw fix #108170
Openssl mingw fix #108170
Conversation
Hello community, I see that my fix is breaking this line https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix#L395. I am not that advanced in Nix. Could you please help on correcting that part? |
You removed openssl from inputs and the function there still calls it with openssl. I think you need to remove openssl there but I am not sure if your PR is correct otherwise. |
Thank you for the explanation. I will need to correct the commit so that it can take both coreutils and perl as input parameters while still using buildPackages for mingw build. |
d937849
to
23ac4d8
Compare
Succcessfuly tested builds:
|
Result of |
@SuperSandro2000: I am having trouble to add @peti as reviewer. There is no option for me to add any user as reviewer. Could you please help me? |
I tried building this locally, but there seems to be a patch gone missing:
Also, it's probably easier to not nixpkgs-fmt |
Hello Florian, I am unable to reproduce the issue you are having. I have tested my changes against latest nixpkgs-unstable branch.
|
You have the patch locally but we do not so we can't fetch it. |
I am confused a little. I wanted to contribute to solving #82924 for Windows. The only change I did was to openssl default.nix file. I didn't add any other files locally. What do I need to do then so you guys can merge the fix? |
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 don't gratitously reformat the file. The cosmetic changes in the diff obscure the real changes.
I wasn't able to build this, because the cross-gcc to mingw referred to a non-existent patch file (https://raw.githubusercontent.com/lhmouse/MINGW-packages/740f233da00c4fb5bcc225b2e29768824bcecc58/mingw-w64-gcc-git/9000-gcc-10-branch-Added-mcf-thread-model-support-from-mcfgthread.patch), which seems to have disappeared from the internet. This has been solved in the meantime, by inlining the patches (see #107978). Please rebase this PR to master, and as requested by @peti, don't reformat unrelated things. |
3542e6b
to
b9b1530
Compare
I have cleaned up the commit and resolved the merge conflict with commit f52263c |
Where is this |
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.
Adding buildPackages as argument to common is actually not required.
b9b1530
to
f958547
Compare
I have added the changes. |
If |
It seems that removing these makes tests unhappy. attribute 'coreutils' missing, at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/ofborg-evaluator-3/pkgs/development/libraries/openssl/default.nix:37:60 |
But how did it work before? It's the same buildPackages that is used, no? |
I'm also getting We could do something like |
f958547
to
e60989a
Compare
e60989a
to
dc9694c
Compare
I fixed it; the bootstrapping issue was just because of the I also answered by question above; |
Can confirm that this fixed it for me. When I compile |
@Radvendii Let's just do that separately. |
Motivation for this change
Corrected cross-compilation to Windows for OpenSSL 1.1.
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)