From b45794eb9681a0871e6d336eb9ab04e93e7fa74e Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 13 Sep 2023 15:30:27 -0400 Subject: [PATCH] haskellPackages.twain: unbreak by overriding http2 deeply --- pkgs/development/haskell-modules/configuration-common.nix | 4 +++- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6df27eaf6c57..c5aef8b2b131 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -319,7 +319,9 @@ self: super: { patat = super.patat.override { pandoc = self.pandoc_3_1_6_1; }; # http2 also overridden in all-packages.nix for mailctl. - twain = super.twain.override { http2 = self.http2_3_0_3; }; + # twain is currently only used by mailctl, so the .overrideScope shouldn't + # negatively affect any other packages, at least currently... + twain = super.twain.overrideScope (self: _: { http2 = self.http2_3_0_3; }); # The latest release on hackage has an upper bound on containers which # breaks the build, though it works with the version of containers present diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 35dc2c2742f4..acf19176b95e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5585,7 +5585,6 @@ broken-packages: - turing-machines # failure in job https://hydra.nixos.org/build/233195604 at 2023-09-02 - turing-music # failure in job https://hydra.nixos.org/build/233203435 at 2023-09-02 - turtle-options # failure in job https://hydra.nixos.org/build/233255831 at 2023-09-02 - - twain # failure in job https://hydra.nixos.org/build/234467075 at 2023-09-13 - tweak # failure in job https://hydra.nixos.org/build/233211020 at 2023-09-02 - twentefp-websockets # failure in job https://hydra.nixos.org/build/233207022 at 2023-09-02 - twhs # failure in job https://hydra.nixos.org/build/233201182 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 92c22a31b363..d6cc9f68a091 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -303041,8 +303041,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Tiny web application framework for WAI"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tweak" = callPackage