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

ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args

Browse Source 
The compilers themselves can pull them from `bootPkgs`, where they
should always come from anyways. This enforces that, simplifies that
code, and allows use to avoid more `rec { ... }` too.
This commit is contained in:
John Ericson
2018-09-24 20:00:39 -04:00
parent 5779fdb3d0
commit e6a476c862
8 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/haskell-packages.nix
+8 -16
View File
@@ -47,41 +47,35 @@ in {
ghc7103Binary = callPackage ../development/compilers/ghc/7.10.3-binary.nix { };
ghc821Binary = callPackage ../development/compilers/ghc/8.2.1-binary.nix { };
ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix rec {
ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix {
bootPkgs = packages.ghc7103Binary;
inherit (bootPkgs) hscolour;
buildLlvmPackages = buildPackages.llvmPackages_35;
llvmPackages = pkgs.llvmPackages_35;
};
ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec {
ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix {
bootPkgs = packages.ghc7103Binary;
inherit (bootPkgs) hscolour;
sphinx = pkgs.python27Packages.sphinx;
buildLlvmPackages = buildPackages.llvmPackages_37;
llvmPackages = pkgs.llvmPackages_37;
};
ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix rec {
ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix {
bootPkgs = packages.ghc821Binary;
inherit (bootPkgs) hscolour alex happy;
sphinx = pkgs.python3Packages.sphinx;
buildLlvmPackages = buildPackages.llvmPackages_39;
llvmPackages = pkgs.llvmPackages_39;
};
ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix rec {
ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix {
bootPkgs = packages.ghc821Binary;
inherit (bootPkgs) alex happy hscolour;
buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5;
};
ghc861 = callPackage ../development/compilers/ghc/8.6.1.nix rec {
ghc861 = callPackage ../development/compilers/ghc/8.6.1.nix {
bootPkgs = packages.ghc822;
inherit (bootPkgs) alex happy hscolour;
buildLlvmPackages = buildPackages.llvmPackages_6;
llvmPackages = pkgs.llvmPackages_6;
};
ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc821Binary;
inherit (bootPkgs) alex happy hscolour;
buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5;
};
@@ -94,15 +88,13 @@ in {
bootPkgs = packages.ghc802;
inherit (pkgs) cabal-install;
};
ghcjs82 = callPackage ../development/compilers/ghcjs-ng rec {
ghcjs82 = callPackage ../development/compilers/ghcjs-ng {
bootPkgs = packages.ghc822;
inherit (bootPkgs) alex happy;
ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json;
stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
};
ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec {
ghcjs84 = callPackage ../development/compilers/ghcjs-ng {
bootPkgs = packages.ghc843;
inherit (bootPkgs) alex happy;
ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json;
stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {};