From b0820d6fb55f35333df267d837b819e9b72d7fc8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 12 Aug 2025 01:18:50 +0200 Subject: [PATCH] haskellPackages.mighttpd2: unbreak and adopt --- .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/configuration-nix.nix | 16 ++++++++++++++++ .../haskell-modules/hackage-packages.nix | 3 +-- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f31f05b8d188..acb09f39c2dd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3882,7 +3882,6 @@ broken-packages: - midi-utils # failure in job https://hydra.nixos.org/build/233222257 at 2023-09-02 - midisurface # failure in job https://hydra.nixos.org/build/233224559 at 2023-09-02 - mig-swagger-ui # failure in job https://hydra.nixos.org/build/295095369 at 2025-04-22 - - mighttpd2 # failure in job https://hydra.nixos.org/build/233213125 at 2023-09-02 - mikmod # failure in job https://hydra.nixos.org/build/233247364 at 2023-09-02 - mikrokosmos # failure in job https://hydra.nixos.org/build/233232143 at 2023-09-02 - miku # failure in job https://hydra.nixos.org/build/233212186 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 a8e3ac27c4fe..b97e4aad1a88 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -513,6 +513,7 @@ package-maintainers: - regex-rure - jacinda - citeproc + - mighttpd2 # owothia - irc-client - chatter diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 1db8049987b9..2b633285cb34 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1755,6 +1755,22 @@ builtins.intersectAttrs super { ''; }) super.wai-app-file-cgi; + # All flags are off by default + mighttpd2 = lib.pipe super.mighttpd2 [ + # Library shouldn't increase closure size of resulting daemon and utility executables + enableSeparateBinOutput + # Enable all possible features + (enableCabalFlag "dhall") + (addBuildDepends [ self.dhall ]) + (enableCabalFlag "tls") + (addBuildDepends [ + self.warp-tls + self.tls + ]) + # Can't build quic with Stackage LTS at the moment (random >= 1.3, tls >= 2.1.10) + (disableCabalFlag "quic") + ]; + # Makes the mpi-hs package respect the choice of mpi implementation in Nixpkgs. # Also adds required test dependencies for checks to pass mpi-hs = diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a7b4f53c5afe..20250310517c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -443515,8 +443515,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "High performance web server on WAI/warp"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.sternenseemann ]; } ) { };