diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-24 19:59:17 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-24 20:00:39 -0400 |
commit | e6a476c862953ef9853ae069aed6b3df23906637 (patch) | |
tree | 80d1b9e1e3edc28e76173bacaef72f18b6877cba /pkgs/top-level/haskell-packages.nix | |
parent | 5779fdb3d0534aff0690b7c6242c1f3123dcd959 (diff) | |
download | nixpkgs-e6a476c862953ef9853ae069aed6b3df23906637.tar nixpkgs-e6a476c862953ef9853ae069aed6b3df23906637.tar.gz nixpkgs-e6a476c862953ef9853ae069aed6b3df23906637.tar.bz2 nixpkgs-e6a476c862953ef9853ae069aed6b3df23906637.tar.lz nixpkgs-e6a476c862953ef9853ae069aed6b3df23906637.tar.xz nixpkgs-e6a476c862953ef9853ae069aed6b3df23906637.tar.zst nixpkgs-e6a476c862953ef9853ae069aed6b3df23906637.zip |
ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args
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.
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 92fbdd85b35..bbb028ceb4b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -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 {}; |