BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

haskell infra: Fix built-time overrides

Browse source 
These should all come from `buildHaskellPackages`
This commit is contained in:
John Ericson 2018-07-09 12:22:23 -04:00
parent f27f491784
commit 740cfffcb2
5 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -510,8 +510,14 @@ self: super: {
doctest-prop = dontCheck super.doctest-prop; doctest-prop = dontCheck super.doctest-prop;
# Depends on itself for testing # Depends on itself for testing
doctest-discover = addBuildTool super.doctest-discover (dontCheck super.doctest-discover); doctest-discover = addBuildTool super.doctest-discover
tasty-discover = addBuildTool super.tasty-discover (dontCheck super.tasty-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 # generic-deriving bound is too tight
aeson = doJailbreak super.aeson; aeson = doJailbreak super.aeson;
@ -597,7 +603,7 @@ self: super: {
# Install icons, metadata and cli program. # Install icons, metadata and cli program.
bustle = overrideCabal super.bustle (drv: { bustle = overrideCabal super.bustle (drv: {
buildDepends = [ pkgs.libpcap ]; buildDepends = [ pkgs.libpcap ];
buildTools = with pkgs; [ gettext perl help2man intltool ]; buildTools = with pkgs.buildPackages; [ gettext perl help2man intltool ];
patches = [ patches = [
# Add missing gio-unix-2.0 dependency # Add missing gio-unix-2.0 dependency
(pkgs.fetchpatch { (pkgs.fetchpatch {
@ -665,7 +671,7 @@ self: super: {
# Need newer versions of their dependencies than the ones we have in LTS-11.x. # 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; }); 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; }); 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; }); status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
# https://github.com/bos/configurator/issues/22 # https://github.com/bos/configurator/issues/22
@ -698,8 +704,8 @@ self: super: {
jsaddle = dontCheck super.jsaddle; jsaddle = dontCheck super.jsaddle;
# Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza
cairo = addBuildTool super.cairo self.gtk2hs-buildtools; cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools;
pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"]; pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"];
gtk = gtk =
if pkgs.stdenv.isDarwin if pkgs.stdenv.isDarwin
then appendConfigureFlag super.gtk "-fhave-quartz-gtk" then appendConfigureFlag super.gtk "-fhave-quartz-gtk"

2
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View file

@ -39,7 +39,7 @@ self: super: {
# Build jailbreak-cabal with the latest version of Cabal. # Build jailbreak-cabal with the latest version of Cabal.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; }; 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 # https://github.com/mrkkrp/megaparsec/issues/282
megaparsec = addBuildDepend (dontCheck super.megaparsec) self.fail; megaparsec = addBuildDepend (dontCheck super.megaparsec) self.fail;

8
pkgs/development/haskell-modules/configuration-ghcjs.nix
View file

@ -23,9 +23,9 @@ self: super:
}; };
in stage1 // stage2 // { in stage1 // stage2 // {
network = addBuildTools super.network (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.stdenv.isDarwin pkgs.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.stdenv.isDarwin pkgs.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. # LLVM is not supported on this GHC; use the latest one.
inherit (pkgs) llvmPackages; inherit (pkgs) llvmPackages;
@ -121,7 +121,7 @@ self: super:
}); });
ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: { 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 ]; libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ];
isLibrary = true; isLibrary = true;
}); });

12
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -138,10 +138,10 @@ self: super: builtins.intersectAttrs super {
else super.x509-system; else super.x509-system;
# https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 # 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"]; gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.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"]; 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; gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2;
gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3; 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/13
# https://github.com/edwinb/EpiVM/issues/14 # 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 # https://github.com/ekmett/wl-pprint-terminfo/issues/7
wl-pprint-terminfo = addExtraLibrary super.wl-pprint-terminfo pkgs.ncurses; 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"; io-streams = enableCabalFlag super.io-streams "NoInteractiveTests";
# requires autotools to build # 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 # 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 # This propagates this to everything depending on haskell-gi-base
haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection; haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection;

2
pkgs/top-level/splice.nix
View file

@ -121,7 +121,7 @@ let
in in
{ {
inherit splicedPackages; inherit splicePackages;
# We use `callPackage' to be able to omit function arguments that can be # We use `callPackage' to be able to omit function arguments that can be
# obtained `pkgs` or `buildPackages` and their `xorg` package sets. Use # obtained `pkgs` or `buildPackages` and their `xorg` package sets. Use