diff options
author | Jude Taylor <me@jude.bio> | 2016-01-13 12:04:13 -0800 |
---|---|---|
committer | Jude Taylor <me@jude.bio> | 2016-01-13 12:04:18 -0800 |
commit | c6ad4841fd4e068326d9a517bdf010b37294d568 (patch) | |
tree | fad998e8ea907e2b1b7301d7b75732710c80c962 /pkgs/top-level/haskell-packages.nix | |
parent | 552207f5ef690b8424d414914a983076cacdbaa2 (diff) | |
download | nixlib-c6ad4841fd4e068326d9a517bdf010b37294d568.tar nixlib-c6ad4841fd4e068326d9a517bdf010b37294d568.tar.gz nixlib-c6ad4841fd4e068326d9a517bdf010b37294d568.tar.bz2 nixlib-c6ad4841fd4e068326d9a517bdf010b37294d568.tar.lz nixlib-c6ad4841fd4e068326d9a517bdf010b37294d568.tar.xz nixlib-c6ad4841fd4e068326d9a517bdf010b37294d568.tar.zst nixlib-c6ad4841fd4e068326d9a517bdf010b37294d568.zip |
clean up GHC expressions
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 68c303c00b3d..130a4e7006ef 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -7,48 +7,48 @@ rec { compiler = { ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; }; - ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix ({ gmp = pkgs.gmp4; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({ gmp = pkgs.gmp4; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); + ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix { + gmp = pkgs.gmp4; + }; + ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix { + gmp = pkgs.gmp4; + }; ghc6104 = callPackage ../development/compilers/ghc/6.10.4.nix { ghc = compiler.ghc6102Binary; }; ghc6123 = callPackage ../development/compilers/ghc/6.12.3.nix { ghc = compiler.ghc6102Binary; }; - ghc704 = callPackage ../development/compilers/ghc/7.0.4.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc722 = callPackage ../development/compilers/ghc/7.2.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc783 = callPackage ../development/compilers/ghc/7.8.3.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix ({ ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); + ghc704 = callPackage ../development/compilers/ghc/7.0.4.nix { + ghc = compiler.ghc704Binary; + }; + ghc722 = callPackage ../development/compilers/ghc/7.2.2.nix { + ghc = compiler.ghc704Binary; + }; + ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix { + ghc = compiler.ghc704Binary; + }; + ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix { + ghc = compiler.ghc704Binary; + }; + ghc783 = callPackage ../development/compilers/ghc/7.8.3.nix { + ghc = compiler.ghc742Binary; + }; + ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix { + ghc = compiler.ghc742Binary; + }; + ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix { + ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; + }; + ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix { + ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; + }; ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix { ghc = compiler.ghc7103; inherit (packages.ghc7103) hscolour; }; + ghcHEAD = callPackage ../development/compilers/ghc/head.nix { + inherit (packages.ghc784) ghc alex happy; + }; + ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix { + inherit (packages.ghc784) ghc alex happy; + }; ghcjs = packages.ghc7102.callPackage ../development/compilers/ghcjs { ghc = compiler.ghc7102; |