Skip to content

haskellPackages.http2-client: fix w/ current http2, tls, network #386711

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

Merged
maralorn merged 1 commit into from
Mar 3, 2025
Merged

haskellPackages.http2-client: fix w/ current http2, tls, network #386711

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2734,13 +2734,17 @@ self: super: {
"--extra-include-dirs=${lib.getDev pkgs.opencascade-occt}/include/opencascade"
] super.opencascade-hs;

# https://github.com/haskell-grpc-native/http2-client/pull/95
# https://github.com/haskell-grpc-native/http2-client/pull/96
http2-client = appendPatch
# https://github.com/haskell-grpc-native/http2-client/pull/97
# Apply patch for http2 >= 5.2, allow tls >= 2.1 and network >= 3.2
http2-client = appendPatches [
(fetchpatch {
name = "http2-client-fix-build-with-http2-5.2.patch";
url = "https://github.com/haskell-grpc-native/http2-client/commit/952a57d1138dc31863a5e387dbda67cbdfcfd9f4.patch";
sha256 = "1q0n7338rjz7zl6xpw51lljp7xw1gl128s1d5877kfil3fc23npp";
}) super.http2-client;
name = "http2-client-fix-build-with-http2-5.3.patch";
url = "https://github.com/haskell-grpc-native/http2-client/pull/97/commits/95143e4843253913097838ab791ef39ddfd90b33.patch";
Copy link
Copy Markdown
Contributor

@9999years 9999years Mar 3, 2025

Choose a reason for hiding this comment

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

URLs like this can break when the PR is force-pushed, might want to do this instead:

Suggested change
url = "https://github.com/haskell-grpc-native/http2-client/pull/97/commits/95143e4843253913097838ab791ef39ddfd90b33.patch";
url = "https://github.com/haskell-grpc-native/http2-client/commit/95143e4843253913097838ab791ef39ddfd90b33.patch";

Copy link
Copy Markdown
Member Author

@sternenseemann sternenseemann Mar 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Even with the alternative the link it'll break on force pushes since GitHub usually gcs the commit iirc?

Copy link
Copy Markdown
Contributor

@9999years 9999years Mar 3, 2025

Choose a reason for hiding this comment

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

Not sure. We've had better luck with URLs like this but nothing is certain.

Copy link
Copy Markdown
Member

@maralorn maralorn Mar 3, 2025

Choose a reason for hiding this comment

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

In my experience the recommended change is more stable. It‘s not rock solid according to reports I‘ve heard, but it’s the best we can do.

sha256 = "09205ziac59axld8v1cyxa9xl42srypaq8d1gf6y3qwpmrx3rgr9";
})
] (doJailbreak super.http2-client);
Comment on lines +2741 to +2747
Copy link
Copy Markdown
Member

@maralorn maralorn Mar 3, 2025

Choose a reason for hiding this comment

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

Why the plural helper now?^^

Copy link
Copy Markdown
Member Author

@sternenseemann sternenseemann Mar 3, 2025

Choose a reason for hiding this comment

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

I originally also picked the patch relaxing the tls bound from haskell-grpc-native/http2-client#97, but the network bound is also too strict so I decided I wouldn't bother and just jailbreak.


# 2025-01-23: jailbreak to allow base >= 4.17
warp-systemd = doJailbreak super.warp-systemd;
Expand Down