clean up GHC expressions

This commit is contained in:
Jude Taylor 2016-01-13 12:04:13 -08:00
parent 552207f5ef
commit c6ad4841fd

View File

@ -7,48 +7,48 @@ rec {
compiler = { compiler = {
ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; }; 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 { ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix {
libiconv = pkgs.darwin.libiconv; gmp = pkgs.gmp4;
}); };
ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({ gmp = pkgs.gmp4; } // stdenv.lib.optionalAttrs stdenv.isDarwin { ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix {
libiconv = pkgs.darwin.libiconv; gmp = pkgs.gmp4;
}); };
ghc6104 = callPackage ../development/compilers/ghc/6.10.4.nix { ghc = compiler.ghc6102Binary; }; ghc6104 = callPackage ../development/compilers/ghc/6.10.4.nix { ghc = compiler.ghc6102Binary; };
ghc6123 = callPackage ../development/compilers/ghc/6.12.3.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 { ghc704 = callPackage ../development/compilers/ghc/7.0.4.nix {
libiconv = pkgs.darwin.libiconv; ghc = compiler.ghc704Binary;
}); };
ghc722 = callPackage ../development/compilers/ghc/7.2.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { ghc722 = callPackage ../development/compilers/ghc/7.2.2.nix {
libiconv = pkgs.darwin.libiconv; ghc = compiler.ghc704Binary;
}); };
ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix {
libiconv = pkgs.darwin.libiconv; ghc = compiler.ghc704Binary;
}); };
ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix {
libiconv = pkgs.darwin.libiconv; ghc = compiler.ghc704Binary;
}); };
ghc783 = callPackage ../development/compilers/ghc/7.8.3.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { ghc783 = callPackage ../development/compilers/ghc/7.8.3.nix {
libiconv = pkgs.darwin.libiconv; ghc = compiler.ghc742Binary;
}); };
ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix {
libiconv = pkgs.darwin.libiconv; ghc = compiler.ghc742Binary;
}); };
ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; } // stdenv.lib.optionalAttrs stdenv.isDarwin { ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix {
libiconv = pkgs.darwin.libiconv; ghc = compiler.ghc784; inherit (packages.ghc784) hscolour;
}); };
ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix ({ ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; } // stdenv.lib.optionalAttrs stdenv.isDarwin { ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix {
libiconv = pkgs.darwin.libiconv; ghc = compiler.ghc784; inherit (packages.ghc784) hscolour;
}); };
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;
});
ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix { ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix {
ghc = compiler.ghc7103; inherit (packages.ghc7103) hscolour; 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 { ghcjs = packages.ghc7102.callPackage ../development/compilers/ghcjs {
ghc = compiler.ghc7102; ghc = compiler.ghc7102;