From de0cf8b75ecfac9ca40781ce669e1a18ae6baee3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Feb 2021 23:59:46 +0100 Subject: [PATCH] haskellPackages.{qtah*,hoppy*}: Fix build and mark as unbroken --- .../development/haskell-modules/configuration-common.nix | 5 +++++ .../haskell-modules/configuration-hackage2nix.yaml | 9 --------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ad242777ec1..e6f60166a19 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -120,6 +120,11 @@ self: super: { extraLibraries = [ pkgs.blas ]; }); + # Requires wrapQtAppsHook + qtah-cpp-qt5 = overrideCabal super.qtah-cpp-qt5 (drv: { + buildDepends = [ pkgs.qt5.wrapQtAppsHook ]; + }); + # The Haddock phase fails for one reason or another. deepseq-magic = dontHaddock super.deepseq-magic; feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 94a9efe81c9..5e18ab82679 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6127,7 +6127,6 @@ broken-packages: - haskell-reflect - haskell-rules - haskell-spacegoo - - haskell-src - haskell-src-exts-observe - haskell-src-exts-prisms - haskell-src-exts-qq @@ -6623,10 +6622,6 @@ broken-packages: - hopencl - HOpenCV - hopfield - - hoppy-docs - - hoppy-generator - - hoppy-runtime - - hoppy-std - hops - hoq - horizon @@ -9254,10 +9249,6 @@ broken-packages: - qr-imager - qr-repa - qsem - - qtah-cpp-qt5 - - qtah-examples - - qtah-generator - - qtah-qt5 - QuadEdge - QuadTree - quantfin