nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-19 07:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

haskellPackages: move various dep overrides to configuration-nix

Browse Source 
Most of these packages don't build at the moment, but it looks like the
overrides are going to be necessary going forward as well.
This commit is contained in:
sternenseemann
2026-04-19 17:58:42 +02:00
parent d4d7a06796
commit c9771f6df7
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/haskell-modules/configuration-common.nix
View File

@@ -835,13 +835,6 @@ with haskellLib;
# Tests require a Kafka broker running locally
haskakafka = dontCheck super.haskakafka;
bindings-levmar = addExtraLibrary pkgs.blas super.bindings-levmar;
# Requires wrapQtAppsHook
qtah-cpp-qt5 = overrideCabal (drv: {
buildDepends = [ pkgs.qt5.wrapQtAppsHook ];
}) super.qtah-cpp-qt5;
# 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
@@ -1211,9 +1204,6 @@ with haskellLib;
# https://github.com/pixbi/duplo/issues/25
duplo = doJailbreak super.duplo;
# https://github.com/evanrinehart/mikmod/issues/1
mikmod = addExtraLibrary pkgs.libmikmod super.mikmod;
# Missing module.
rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5
rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6
@@ -1519,10 +1509,6 @@ with haskellLib;
preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
}) super.alex;
# Compiles some C or C++ source which requires these headers
VulkanMemoryAllocator = addExtraLibrary pkgs.vulkan-headers super.VulkanMemoryAllocator;
vulkan-utils = addExtraLibrary pkgs.vulkan-headers super.vulkan-utils;
# Generate cli completions for dhall.
dhall = self.generateOptparseApplicativeCompletions [ "dhall" ] super.dhall;
# 2025-01-27: allow aeson >= 2.2, 9.8 versions of text and bytestring

15
pkgs/development/haskell-modules/configuration-nix.nix
View File

@@ -214,6 +214,18 @@ builtins.intersectAttrs super {
'';
}) super.cuda;
# Compiles some C or C++ source which requires these headers
VulkanMemoryAllocator = addExtraLibrary pkgs.vulkan-headers super.VulkanMemoryAllocator;
vulkan-utils = addExtraLibrary pkgs.vulkan-headers super.vulkan-utils;
# Requires wrapQtAppsHook
qtah-cpp-qt5 = overrideCabal (drv: {
buildDepends = [ pkgs.qt5.wrapQtAppsHook ];
}) super.qtah-cpp-qt5;
# https://github.com/evanrinehart/mikmod/issues/1
mikmod = addExtraLibrary pkgs.libmikmod super.mikmod;
nvvm = overrideCabal (drv: {
preConfigure = ''
export CUDA_PATH=${pkgs.cudatoolkit}
@@ -384,6 +396,9 @@ builtins.intersectAttrs super {
addBuildDepends [ pkgs.double-conversion ] super.double-conversion
);
# library dependency declaration hidden behind conditional
bindings-levmar = addExtraLibrary pkgs.blas super.bindings-levmar;
# https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216
gio = lib.pipe super.gio [
(disableHardening [ "fortify" ])