From f9e7c251b9f6fc0f653a19be54fbb7c261902af1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 19 Apr 2026 21:42:50 +0200 Subject: [PATCH] haskellPackages.http2-tls: pin to 0.4.5 to match crypton/tls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …from Stackage LTS 24. --- .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/main.yaml | 2 + .../transitive-broken.yaml | 4 -- .../haskell-modules/hackage-packages.nix | 46 +++++++++++++++++-- 4 files changed, 43 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index b3a363ca4759..ba313e332f29 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3185,7 +3185,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/316190912 at 2025-12-19 - 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/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 7a7ae4225004..80b4fc3bd1a1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -43,6 +43,8 @@ default-package-overrides: - hnix-store-remote < 0.7 # 2025-08-03: need to match stackage version of hosc - hsc3 >= 0.21 && < 0.22 + # 2026-04-19: needs to match tls and crypton-x509-store from Stackage LTS 24 + - http2-tls < 0.4.6 # liquidhaskell-boot 0.9.10.1.2 requires this specific version of liquid-fixpoint - liquid-fixpoint == 0.9.6.3.2 # liquidhaskell(-boot) support one GHC at a time, so we choose the one matching the current GHC (9.10) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 2a31d388fb59..6852ce279ff9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -215,7 +215,6 @@ dont-distribute-packages: - bbi - bdcs - bdcs-api - - beam-duckdb - beam-th - beautifHOL - bech32-th @@ -879,7 +878,6 @@ dont-distribute-packages: - eventium-memory - eventium-postgresql - eventium-sqlite - - eventlog-live-otelcol - EventSocket - eventsource-geteventstore-store - eventsource-store-specs @@ -1189,8 +1187,6 @@ dont-distribute-packages: - grapefruit-records - grapefruit-ui - grapefruit-ui-gtk - - grapesy - - grapesy-etcd - graph-rewriting-cl - graph-rewriting-gl - graph-rewriting-lambdascope diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1f75199d32c1..9f835ec4cbe7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -101909,7 +101909,6 @@ self: { ]; description = "DuckDB backend for Beam"; license = lib.meta.getLicenseFromSpdxId "MIT"; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Ai-Ya-Ya ]; } ) { }; @@ -226828,7 +226827,6 @@ self: { ]; description = "Stream eventlog data to the OpenTelemetry Collector"; license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; mainProgram = "eventlog-live-otelcol"; } ) { }; @@ -288419,7 +288417,6 @@ self: { ]; description = "Native Haskell implementation of the gRPC framework"; license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -288443,7 +288440,6 @@ self: { ]; description = "grapesy-etcd - GRPC interface to etcd"; license = lib.meta.getLicenseFromSpdxId "Apache-2.0"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -373006,6 +373002,47 @@ self: { ) { }; http2-tls = callPackage ( + { + mkDerivation, + base, + bytestring, + crypton-x509-store, + crypton-x509-validation, + http2, + network, + network-control, + network-run, + recv, + time-manager, + tls, + utf8-string, + }: + mkDerivation { + pname = "http2-tls"; + version = "0.4.5"; + sha256 = "0kc7g8ldgm40fsh73r881pxjb87x0m00xnjd0zsl0baaa85f7r4y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base + bytestring + crypton-x509-store + crypton-x509-validation + http2 + network + network-control + network-run + recv + time-manager + tls + utf8-string + ]; + description = "Library for HTTP/2 over TLS"; + license = lib.licenses.bsd3; + } + ) { }; + + http2-tls_0_5_3 = callPackage ( { mkDerivation, base, @@ -373048,7 +373085,6 @@ self: { description = "Library for HTTP/2 over TLS"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; } ) { };