haskell infra: Fix built-time overrides
These should all come from `buildHaskellPackages`
This commit is contained in:
parent
f27f491784
commit
740cfffcb2
|
@ -510,8 +510,14 @@ self: super: {
|
|||
doctest-prop = dontCheck super.doctest-prop;
|
||||
|
||||
# Depends on itself for testing
|
||||
doctest-discover = addBuildTool super.doctest-discover (dontCheck super.doctest-discover);
|
||||
tasty-discover = addBuildTool super.tasty-discover (dontCheck super.tasty-discover);
|
||||
doctest-discover = addBuildTool super.doctest-discover
|
||||
(if pkgs.buildPlatform != pkgs.hostPlatform
|
||||
then self.buildHaskellPackages.doctest-discover
|
||||
else dontCheck super.doctest-discover);
|
||||
tasty-discover = addBuildTool super.tasty-discover
|
||||
(if pkgs.buildPlatform != pkgs.hostPlatform
|
||||
then self.buildHaskellPackages.tasty-discover
|
||||
else dontCheck super.tasty-discover);
|
||||
|
||||
# generic-deriving bound is too tight
|
||||
aeson = doJailbreak super.aeson;
|
||||
|
@ -597,7 +603,7 @@ self: super: {
|
|||
# Install icons, metadata and cli program.
|
||||
bustle = overrideCabal super.bustle (drv: {
|
||||
buildDepends = [ pkgs.libpcap ];
|
||||
buildTools = with pkgs; [ gettext perl help2man intltool ];
|
||||
buildTools = with pkgs.buildPackages; [ gettext perl help2man intltool ];
|
||||
patches = [
|
||||
# Add missing gio-unix-2.0 dependency
|
||||
(pkgs.fetchpatch {
|
||||
|
@ -665,7 +671,7 @@ self: super: {
|
|||
# Need newer versions of their dependencies than the ones we have in LTS-11.x.
|
||||
cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; });
|
||||
dbus-hslogger = super.dbus-hslogger.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
|
||||
graphviz = (addBuildTool super.graphviz pkgs.graphviz).overrideScope (self: super: { wl-pprint-text = self.wl-pprint-text_1_2_0_0; base-compat = self.base-compat_0_10_4; });
|
||||
graphviz = (addBuildTool super.graphviz pkgs.buildPackages.graphviz).overrideScope (self: super: { wl-pprint-text = self.wl-pprint-text_1_2_0_0; base-compat = self.base-compat_0_10_4; });
|
||||
status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
|
||||
|
||||
# https://github.com/bos/configurator/issues/22
|
||||
|
@ -698,8 +704,8 @@ self: super: {
|
|||
jsaddle = dontCheck super.jsaddle;
|
||||
|
||||
# Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza
|
||||
cairo = addBuildTool super.cairo self.gtk2hs-buildtools;
|
||||
pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"];
|
||||
cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools;
|
||||
pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"];
|
||||
gtk =
|
||||
if pkgs.stdenv.isDarwin
|
||||
then appendConfigureFlag super.gtk "-fhave-quartz-gtk"
|
||||
|
|
|
@ -39,7 +39,7 @@ self: super: {
|
|||
# Build jailbreak-cabal with the latest version of Cabal.
|
||||
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
|
||||
|
||||
gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_2_0; };
|
||||
gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.buildHaskellPackages.Cabal_1_24_2_0; };
|
||||
|
||||
# https://github.com/mrkkrp/megaparsec/issues/282
|
||||
megaparsec = addBuildDepend (dontCheck super.megaparsec) self.fail;
|
||||
|
|
|
@ -23,9 +23,9 @@ self: super:
|
|||
};
|
||||
in stage1 // stage2 // {
|
||||
|
||||
network = addBuildTools super.network (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv);
|
||||
zlib = addBuildTools super.zlib (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv);
|
||||
unix-compat = addBuildTools super.unix-compat (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv);
|
||||
network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
|
||||
zlib = addBuildTools super.zlib (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
|
||||
unix-compat = addBuildTools super.unix-compat (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
|
||||
|
||||
# LLVM is not supported on this GHC; use the latest one.
|
||||
inherit (pkgs) llvmPackages;
|
||||
|
@ -121,7 +121,7 @@ self: super:
|
|||
});
|
||||
|
||||
ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: {
|
||||
setupHaskellDepends = (drv.setupHaskellDepends or []) ++ [ self.Cabal_1_24_2_0 ];
|
||||
setupHaskellDepends = (drv.setupHaskellDepends or []) ++ [ self.buildHaskellPackages.Cabal_1_24_2_0 ];
|
||||
libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ];
|
||||
isLibrary = true;
|
||||
});
|
||||
|
|
|
@ -138,10 +138,10 @@ self: super: builtins.intersectAttrs super {
|
|||
else super.x509-system;
|
||||
|
||||
# https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216
|
||||
gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
|
||||
glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
|
||||
gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
|
||||
glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
|
||||
gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"];
|
||||
gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
|
||||
gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.buildHaskellPackages.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
|
||||
gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2;
|
||||
gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3;
|
||||
|
||||
|
@ -305,7 +305,7 @@ self: super: builtins.intersectAttrs super {
|
|||
|
||||
# https://github.com/edwinb/EpiVM/issues/13
|
||||
# https://github.com/edwinb/EpiVM/issues/14
|
||||
epic = addExtraLibraries (addBuildTool super.epic self.happy) [pkgs.boehmgc pkgs.gmp];
|
||||
epic = addExtraLibraries (addBuildTool super.epic self.buildHaskellPackages.happy) [pkgs.boehmgc pkgs.gmp];
|
||||
|
||||
# https://github.com/ekmett/wl-pprint-terminfo/issues/7
|
||||
wl-pprint-terminfo = addExtraLibrary super.wl-pprint-terminfo pkgs.ncurses;
|
||||
|
@ -469,10 +469,10 @@ self: super: builtins.intersectAttrs super {
|
|||
io-streams = enableCabalFlag super.io-streams "NoInteractiveTests";
|
||||
|
||||
# requires autotools to build
|
||||
secp256k1 = addBuildTools super.secp256k1 [ pkgs.autoconf pkgs.automake pkgs.libtool ];
|
||||
secp256k1 = addBuildTools super.secp256k1 [ pkgs.buildPackages.autoconf pkgs.buildPackages.automake pkgs.buildPackages.libtool ];
|
||||
|
||||
# tests require git
|
||||
hapistrano = addBuildTool super.hapistrano pkgs.git;
|
||||
hapistrano = addBuildTool super.hapistrano pkgs.buildPackages.git;
|
||||
|
||||
# This propagates this to everything depending on haskell-gi-base
|
||||
haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection;
|
||||
|
|
|
@ -121,7 +121,7 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
inherit splicedPackages;
|
||||
inherit splicePackages;
|
||||
|
||||
# We use `callPackage' to be able to omit function arguments that can be
|
||||
# obtained `pkgs` or `buildPackages` and their `xorg` package sets. Use
|
||||
|
|
Loading…
Reference in a new issue