public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell: port existing hardening overrides to use the new combinator

Browse Source
This commit is contained in:
Peter Simons 2016-09-14 19:05:32 +02:00
parent 97fd905823
commit 6607b99168
1 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,9 +26,7 @@ self: super: {
c2hs = dontCheck super.c2hs; c2hs = dontCheck super.c2hs;
# fix errors caused by hardening flags # fix errors caused by hardening flags
epanet-haskell = super.epanet-haskell.overrideDerivation (drv: { epanet-haskell = disableHardening super.epanet-haskell ["format"];
hardeningDisable = [ "format" ];
});
# This test keeps being aborted because it runs too quietly for too long # This test keeps being aborted because it runs too quietly for too long
Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
@ -214,24 +212,10 @@ self: super: {
jwt = dontCheck super.jwt; jwt = dontCheck super.jwt;
# 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 = pkgs.lib.overrideDerivation (addPkgconfigDepend ( gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
addBuildTool super.gio self.gtk2hs-buildtools glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
) pkgs.glib) (drv: { gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"];
hardeningDisable = [ "fortify" ]; gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
});
glib = pkgs.lib.overrideDerivation (addPkgconfigDepend (
addBuildTool super.glib self.gtk2hs-buildtools
) pkgs.glib) (drv: {
hardeningDisable = [ "fortify" ];
});
gtk3 = pkgs.lib.overrideDerivation (super.gtk3.override { inherit (pkgs) gtk3; }) (drv: {
hardeningDisable = [ "fortify" ];
});
gtk = pkgs.lib.overrideDerivation (addPkgconfigDepend (
addBuildTool super.gtk self.gtk2hs-buildtools
) pkgs.gtk2) (drv: {
hardeningDisable = [ "fortify" ];
});
gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; }; gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; };
gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
@ -411,9 +395,7 @@ self: super: {
lensref = dontCheck super.lensref; lensref = dontCheck super.lensref;
liquidhaskell = dontCheck super.liquidhaskell; liquidhaskell = dontCheck super.liquidhaskell;
lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25 lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25
lvmrun = pkgs.lib.overrideDerivation (dontCheck super.lvmrun) (drv: { lvmrun = disableHardening (dontCheck super.lvmrun) ["format"];
hardeningDisable = [ "format" ];
});
memcache = dontCheck super.memcache; memcache = dontCheck super.memcache;
milena = dontCheck super.milena; milena = dontCheck super.milena;
nats-queue = dontCheck super.nats-queue; nats-queue = dontCheck super.nats-queue;
@ -951,9 +933,7 @@ self: super: {
# 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.gtk2hs-buildtools;
pango = (addBuildTool super.pango self.gtk2hs-buildtools).overrideDerivation (drv: { pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"];
hardeningDisable = [ "fortify" ];
});
# Fix tests which would otherwise fail with "Couldn't launch intero process." # Fix tests which would otherwise fail with "Couldn't launch intero process."
intero = overrideCabal super.intero (drv: { intero = overrideCabal super.intero (drv: {