Skip to content

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

Merged
maralorn merged 1 commit into
NixOS:haskell-updatesfrom
sternenseemann:http2-client-http2-5.3
Mar 3, 2025
Merged

haskellPackages.http2-client: fix w/ current http2, tls, network#386711
maralorn merged 1 commit into
NixOS:haskell-updatesfrom
sternenseemann:http2-client-http2-5.3

Conversation

@sternenseemann
Copy link
Copy Markdown
Member

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions Bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Mar 3, 2025
@nix-owners nix-owners Bot requested a review from maralorn March 3, 2025 12:54
@github-actions github-actions Bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 3, 2025
Comment on lines +2741 to +2747
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";
sha256 = "09205ziac59axld8v1cyxa9xl42srypaq8d1gf6y3qwpmrx3rgr9";
})
] (doJailbreak super.http2-client);
Copy link
Copy Markdown
Member

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

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.

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

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

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

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

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.

Copy link
Copy Markdown
Contributor

@mpscholten mpscholten left a comment

Choose a reason for hiding this comment

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

👍

@maralorn maralorn merged commit 7d83830 into NixOS:haskell-updates Mar 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants