diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2017-08-26 11:39:13 -0400 |
|---|---|---|
| committer | Will Fancher <elvishjerricco@gmail.com> | 2017-08-26 11:39:13 -0400 |
| commit | 4d860389d88d35a702f79c0567cb4c6b1ec0deda (patch) | |
| tree | 55ab20bfaf5e227ec2ff09317fcf74a11289c8bf /pkgs/top-level/haskell-packages.nix | |
| parent | 05f9db601abd582be51f096affbb97eff49f2ccb (diff) | |
| parent | 58dc4a85691343a200c1c4495c1bd839b84c2824 (diff) | |
| download | nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.gz nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.bz2 nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.lz nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.xz nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.zst nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.zip | |
Merge branch 'master' into improved-make-overridable
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dde5aa522786..d1739c456fc0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,24 +1,33 @@ -{ pkgs, callPackage, callPackageWithOutput, stdenv, buildPlatform, targetPlatform }: +{ pkgs, lib, stdenv, buildPlatform, targetPlatform }: -let # These are attributes in compiler and packages that don't support integer-simple. - integerSimpleExcludes = [ - "ghc6102Binary" - "ghc704Binary" - "ghc742Binary" - "ghc6104" - "ghc6123" - "ghc704" - "ghc763" - "ghcjs" - "ghcjsHEAD" - "ghcCross" - "jhc" - "uhc" - "integer-simple" - ]; -in rec { +let + # These are attributes in compiler and packages that don't support integer-simple. + integerSimpleExcludes = [ + "ghc6102Binary" + "ghc704Binary" + "ghc742Binary" + "ghc6104" + "ghc6123" + "ghc704" + "ghc763" + "ghcjs" + "ghcjsHEAD" + "ghcCross" + "jhc" + "uhc" + "integer-simple" + ]; + + haskellLib = import ../development/haskell-modules/lib.nix { + inherit (pkgs) lib; + inherit pkgs; + }; - lib = import ../development/haskell-modules/lib.nix { inherit pkgs; }; + callPackage = lib.callPackageWith (pkgs // { inherit haskellLib; }); + callPackageWithOutput = lib.callPackageWithOutputWith (pkgs // { inherit haskellLib; }); + +in rec { + lib = haskellLib; compiler = { @@ -76,7 +85,7 @@ in rec { selfPkgs = packages.ghc821; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { - bootPkgs = packages.ghc7103; + bootPkgs = packages.ghc802; inherit (bootPkgs) alex happy; inherit buildPlatform targetPlatform; selfPkgs = packages.ghcHEAD; |