From 75bdc641bc387759a1c67a4906e1a5053034228b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 3 Dec 2025 19:43:45 +0100 Subject: [PATCH] haskellPackages.http2-tls: fix build, unmark broken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Use tls_2_1_12 to satisfy the tls >= 2.1.10 requirement - Add grapesy override to relax http2 version bound and skip failing tests This fixes the build of eventlog-live-otelcol and other packages depending on http2-tls. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- .../haskell-modules/configuration-common.nix | 11 +++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/transitive-broken.yaml | 2 -- pkgs/development/haskell-modules/hackage-packages.nix | 4 ---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bd8a604c809e..a5fc4a4e3ed6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3032,6 +3032,17 @@ with haskellLib; }) ] (doJailbreak super.http2-client); + # Needs tls >= 2.1.10 + http2-tls = + lib.warnIf (lib.versionAtLeast self.tls.version "2.1.10") + "haskellPackages.http2-tls: tls override can be removed" + (super.http2-tls.override { tls = self.tls_2_1_12; }); + + # Relax http2 version bound (5.3.9 -> 5.3.10) + # https://github.com/well-typed/grapesy/issues/297 + # Tests fail with duplicate IsLabel instance error + grapesy = dontCheck (doJailbreak super.grapesy); + # doctests are failing https://github.com/alpmestan/taggy-lens/issues/8 taggy-lens = dontCheck super.taggy-lens; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 1bab28281090..692786999198 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3163,7 +3163,6 @@ broken-packages: - http-wget # failure in job https://hydra.nixos.org/build/233236793 at 2023-09-02 - http2-client-exe # failure in job https://hydra.nixos.org/build/260189666 at 2024-05-19 - http2-grpc-types # failure in job https://hydra.nixos.org/build/233197769 at 2023-09-02 - - http2-tls # failure in job https://hydra.nixos.org/build/233227095 at 2023-09-02 - httpstan # failure in job https://hydra.nixos.org/build/233202072 at 2023-09-02 - htune # failure in job https://hydra.nixos.org/build/234447885 at 2023-09-13 - htvm # failure in job https://hydra.nixos.org/build/233218993 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index b03d66e0fbe4..6fac5357c380 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -896,7 +896,6 @@ dont-distribute-packages: - eventful-sql-common - eventful-sqlite - eventful-test-helpers - - eventlog-live-otelcol - EventSocket - eventsource-geteventstore-store - eventsource-store-specs @@ -1213,7 +1212,6 @@ dont-distribute-packages: - grapefruit-records - grapefruit-ui - grapefruit-ui-gtk - - grapesy - grapesy-etcd - graph-rewriting-cl - graph-rewriting-gl diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 64d8e83a797e..037e6b0aeaaa 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -221576,7 +221576,6 @@ self: { ]; description = "Stream eventlog data to the OpenTelemetry Collector"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; mainProgram = "eventlog-live-otelcol"; } ) { }; @@ -281292,7 +281291,6 @@ self: { ]; description = "Native Haskell implementation of the gRPC framework"; license = lib.licensesSpdx."BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -362501,8 +362499,6 @@ self: { ]; description = "Library for HTTP/2 over TLS"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { };