summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-06-01 17:32:37 +0200
committerPeter Simons <simons@cryp.to>2015-06-02 10:32:31 +0200
commit682e37e58653b6b41077a7a26b2c62f1789703a6 (patch)
tree680458e17a9fa99c586fce68b259628bcba42c12 /pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
parent873fa649e8e851ea255fe87c6a8f79097aee6d23 (diff)
downloadnixpkgs-682e37e58653b6b41077a7a26b2c62f1789703a6.tar
nixpkgs-682e37e58653b6b41077a7a26b2c62f1789703a6.tar.gz
nixpkgs-682e37e58653b6b41077a7a26b2c62f1789703a6.tar.bz2
nixpkgs-682e37e58653b6b41077a7a26b2c62f1789703a6.tar.lz
nixpkgs-682e37e58653b6b41077a7a26b2c62f1789703a6.tar.xz
nixpkgs-682e37e58653b6b41077a7a26b2c62f1789703a6.tar.zst
nixpkgs-682e37e58653b6b41077a7a26b2c62f1789703a6.zip
haskell-iconv: GHC 7.10.x support was added upstream
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix3
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 964b221d38c..ac02bbc8818 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -292,7 +292,4 @@ self: super: {
   x509-store = appendConfigureFlag super.x509-store "-fignore-me-1";
   x509-system = appendConfigureFlag super.x509-system "-fignore-me-1";
 
-  # Fix compilation under GHC 7.10, patch has been sent upstream.
-  iconv = appendPatch super.iconv ./iconv-fix-ghc710.patch;
-
 }