From 3b986f9281780f3a7616717da100056168ea6dcb Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 19 Apr 2026 16:51:21 +0200 Subject: [PATCH] haskellPackages.hs-opentelemetry-{exporter-handle,exporter-in-memory,instrumentation-{conduit,hspec,persistent,postgresql-simple,tasty,wai},utils-exceptions}: unbreak --- .../haskell-modules/configuration-common.nix | 15 ++++++++++ .../configuration-hackage2nix/broken.yaml | 9 ------ .../transitive-broken.yaml | 5 ---- .../haskell-modules/hackage-packages.nix | 29 ++----------------- 4 files changed, 17 insertions(+), 41 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 628fce06ed3e..ef0381a6c58b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2886,6 +2886,21 @@ with haskellLib; # Too strict bounds on hspec < 2.11 fuzzyset_0_2_4 = doJailbreak super.fuzzyset_0_2_4; + # The following all have too strict bounds on hs-opentelemtry-api < 0.3 + # https://github.com/iand675/hs-opentelemetry/issues/203 + hs-opentelemetry-exporter-handle = doJailbreak super.hs-opentelemetry-exporter-handle; + hs-opentelemetry-exporter-in-memory = doJailbreak super.hs-opentelemetry-exporter-in-memory; + hs-opentelemetry-instrumentation-cloudflare = doJailbreak super.hs-opentelemetry-instrumentation-cloudflare; + hs-opentelemetry-instrumentation-conduit = doJailbreak super.hs-opentelemetry-instrumentation-conduit; + hs-opentelemetry-instrumentation-hspec = doJailbreak super.hs-opentelemetry-instrumentation-hspec; + hs-opentelemetry-instrumentation-http-client = doJailbreak super.hs-opentelemetry-instrumentation-http-client; + hs-opentelemetry-instrumentation-persistent = doJailbreak super.hs-opentelemetry-instrumentation-persistent; + hs-opentelemetry-instrumentation-postgresql-simple = doJailbreak super.hs-opentelemetry-instrumentation-postgresql-simple; + hs-opentelemetry-instrumentation-tasty = doJailbreak super.hs-opentelemetry-instrumentation-tasty; + hs-opentelemetry-instrumentation-wai = doJailbreak super.hs-opentelemetry-instrumentation-wai; + hs-opentelemetry-instrumentation-yesod = doJailbreak super.hs-opentelemetry-instrumentation-yesod; + hs-opentelemetry-utils-exceptions = doJailbreak super.hs-opentelemetry-utils-exceptions; + html-charset = dontCheck super.html-charset; # bytestring <0.11.0, optparse-applicative <0.13.0 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index a2d80067cf0d..91efaecae918 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3010,16 +3010,7 @@ broken-packages: - hs-onnxruntime-capi # failure in job https://hydra.nixos.org/build/307519371 at 2025-09-19 - hs-openmoji-data # failure in job https://hydra.nixos.org/build/295094356 at 2025-04-22 - hs-opentelemetry-awsxray # failure in job https://hydra.nixos.org/build/295094396 at 2025-04-22 - - hs-opentelemetry-exporter-handle # failure in job https://hydra.nixos.org/build/311053149 at 2025-11-02 - - hs-opentelemetry-exporter-in-memory # failure in job https://hydra.nixos.org/build/311053165 at 2025-11-02 - hs-opentelemetry-instrumentation-auto # failure in job https://hydra.nixos.org/build/253678404 at 2024-03-31 - - hs-opentelemetry-instrumentation-conduit # failure in job https://hydra.nixos.org/build/311053155 at 2025-11-02 - - hs-opentelemetry-instrumentation-hspec # failure in job https://hydra.nixos.org/build/311053154 at 2025-11-02 - - hs-opentelemetry-instrumentation-persistent # failure in job https://hydra.nixos.org/build/311053162 at 2025-11-02 - - hs-opentelemetry-instrumentation-postgresql-simple # failure in job https://hydra.nixos.org/build/311053156 at 2025-11-02 - - hs-opentelemetry-instrumentation-tasty # failure in job https://hydra.nixos.org/build/311053195 at 2025-11-02 - - hs-opentelemetry-instrumentation-wai # failure in job https://hydra.nixos.org/build/311053157 at 2025-11-02 - - hs-opentelemetry-utils-exceptions # failure in job https://hydra.nixos.org/build/311053185 at 2025-11-02 - hs-pattrans # failure in job https://hydra.nixos.org/build/233230577 at 2023-09-02 - hs-pgms # failure in job https://hydra.nixos.org/build/233237693 at 2023-09-02 - hs-pkg-config # failure in job https://hydra.nixos.org/build/233240839 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 222d6b70953c..585b490011b6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1584,7 +1584,6 @@ dont-distribute-packages: - hoppy-runtime - hoppy-std - horde-ad - - hotel-california - hotswap - hp2any-graph - hp2any-manager @@ -1626,10 +1625,6 @@ dont-distribute-packages: - hs-functors - hs-gen-iface - hs-ix - - hs-opentelemetry-instrumentation-cloudflare - - hs-opentelemetry-instrumentation-http-client - - hs-opentelemetry-instrumentation-persistent-mysql - - hs-opentelemetry-instrumentation-yesod - hs-profunctors - hs-sdl-term-emulator - hs2ats diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 415e8262d028..957f39e6a76c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -276512,9 +276512,7 @@ self: { ]; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; - maintainers = [ - lib.maintainers.sternenseemann - ]; + maintainers = [ lib.maintainers.sternenseemann ]; } ) { }; @@ -348607,7 +348605,6 @@ self: { unordered-containers ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hotel"; } ) { }; @@ -354054,8 +354051,6 @@ self: { text ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -354078,8 +354073,6 @@ self: { unagi-chan ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -354208,7 +354201,6 @@ self: { wai ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -354231,8 +354223,6 @@ self: { text ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -354257,8 +354247,6 @@ self: { text ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -354299,7 +354287,6 @@ self: { unordered-containers ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -354369,8 +354356,6 @@ self: { vault ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -354410,7 +354395,6 @@ self: { ]; description = "OpenTelemetry instrumentation for persistent-mysql"; license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -354445,8 +354429,6 @@ self: { unordered-containers ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -354485,8 +354467,6 @@ self: { text ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -354520,8 +354500,6 @@ self: { ]; description = "WAI instrumentation middleware for OpenTelemetry"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -354557,7 +354535,6 @@ self: { ]; description = "Yesod middleware for providing OpenTelemetry instrumentation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -354826,8 +354803,6 @@ self: { ]; testHaskellDepends = [ base ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -507814,7 +507789,7 @@ self: { hydraPlatforms = lib.platforms.none; broken = true; } - ) { opus = null; }; + ) { inherit (pkgs) opus; }; opusfile = callPackage ( {