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

libevent: Pull in patches to support LibreSSL 2.7. #41386

Merged
merged 1 commit into from Jun 3, 2018
Merged

libevent: Pull in patches to support LibreSSL 2.7. #41386

merged 1 commit into from Jun 3, 2018

Conversation

qolii
Copy link
Contributor

@qolii qolii commented Jun 2, 2018 •
edited

Motivation for this change

The current release of libevent does not support libressl-2.7. However, upstream master does have patches to support it. These are cherry-picked here.

This triggers a huge rebuild; my system seems to work perfectly since.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@qolii qolii changed the title Pull in libevent patches to support LibreSSL 2.7. libevent: Pull in patches to support LibreSSL 2.7. Jun 2, 2018
jtojnar
jtojnar reviewed Jun 2, 2018
View reviewed changes
pkgs/development/libraries/libevent/default.nix Outdated
@@ -13,6 +13,17 @@ stdenv.mkDerivation rec {
sha256 = "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n";
};

patches = [
(fetchurl {
url = "https://github.com/libevent/libevent/commit/22dd14945c25600de3cf8b91000c66703b551e4f.patch";
Copy link
Contributor

Choose a reason for hiding this comment

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

These patches are generated dynamically by GitHub, so fetchpatch needs to be used.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ach. Thanks! Fixed. I think.

@Anton-Latukha
Copy link
Contributor

Anton-Latukha commented Jun 3, 2018 •
edited

Good manners to write comments what patches are for, and when they should be removed.
You can use:

#NOTE:
#TODO:
#HACK:
#FIXME:

@qolii qolii force-pushed the libevent_libressl_patches branch from 2a61570 to 9ccbc25 Compare June 3, 2018 03:29
@qolii qolii force-pushed the libevent_libressl_patches branch from 9ccbc25 to 1808947 Compare June 3, 2018 03:32
@qolii
Copy link
Contributor Author

qolii commented Jun 3, 2018

@Anton-Latukha, thanks for the comment. Fixed.

@adisbladis
Copy link
Member

adisbladis commented Jun 3, 2018 •
edited

Thanks for your PR!

Because of the rather large rebuild could you rebase this on staging?
We try to avoid mass-rebuilds on master.

@orivej orivej changed the base branch from master to staging June 3, 2018 17:50
@orivej orivej merged commit a4e53b6 into NixOS:staging Jun 3, 2018
@qolii qolii deleted the libevent_libressl_patches branch June 3, 2018 21:38
orivej added a commit that referenced this pull request Jun 4, 2018
@orivej
libevent: fix patch hashes introduced in #41386
b75d7eb 
(cherry picked from commit 968ed95966c481a75ba12f0d975581e909cf6cb3)
@orivej
Copy link
Contributor

orivej commented Jun 4, 2018 •
edited

@volth Thank you! Fixed hashes in b75d7eb.

@qolii
Copy link
Contributor Author

qolii commented Jun 4, 2018

Ugh, sorry guys. I'd already downloaded the patches to my store with fetchurl, and I guess fetchpatch just uses the same store locations, despite needing different hashes.

Is there a way to drop things from your store, to avoid this?

@orivej
Copy link
Contributor

orivej commented Jun 4, 2018

You can remove unused items from the store with nix-collect-garbage.

@Anton-Latukha
Copy link
Contributor

Anton-Latukha commented Jun 5, 2018 •
edited

@qolii
You also can use: nix-store --delete [--ignore-liveness] paths...
To delete chosen ones, aka when Nix uses caches.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@qolii @Anton-Latukha @adisbladis @orivej @jtojnar @GrahamcOfBorg @Janik-Haag