diff options
| author | Peter Simons <simons@cryp.to> | 2021-02-26 23:59:46 +0100 |
|---|---|---|
| committer | Marek Fajkus <marek.faj@gmail.com> | 2021-03-13 12:59:00 +0100 |
| commit | de0cf8b75ecfac9ca40781ce669e1a18ae6baee3 (patch) | |
| tree | 4170eed05500d7c978ff286e7d3c7f18bf55825f /pkgs/development/haskell-modules | |
| parent | 3139ebc4406036ddfe26bd184bc613b260c51a86 (diff) | |
| download | nixpkgs-de0cf8b75ecfac9ca40781ce669e1a18ae6baee3.tar nixpkgs-de0cf8b75ecfac9ca40781ce669e1a18ae6baee3.tar.gz nixpkgs-de0cf8b75ecfac9ca40781ce669e1a18ae6baee3.tar.bz2 nixpkgs-de0cf8b75ecfac9ca40781ce669e1a18ae6baee3.tar.lz nixpkgs-de0cf8b75ecfac9ca40781ce669e1a18ae6baee3.tar.xz nixpkgs-de0cf8b75ecfac9ca40781ce669e1a18ae6baee3.tar.zst nixpkgs-de0cf8b75ecfac9ca40781ce669e1a18ae6baee3.zip | |
haskellPackages.{qtah*,hoppy*}: Fix build and mark as unbroken
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/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 |