summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2020-08-10 19:37:27 +0200
committerGitHub <noreply@github.com>2020-08-10 19:37:27 +0200
commit1493a31aa6c2bf4da9bdeb90c8595394c26aaad3 (patch)
tree24589d2d24627cfd52b61066d60011033efed03b /pkgs/top-level
parent09e83e0cc2f5c66f40a158e27b5c14ffff7cb00d (diff)
parentca9e5d0bb106073018b05d65455faba7878c9ca8 (diff)
downloadnixpkgs-1493a31aa6c2bf4da9bdeb90c8595394c26aaad3.tar
nixpkgs-1493a31aa6c2bf4da9bdeb90c8595394c26aaad3.tar.gz
nixpkgs-1493a31aa6c2bf4da9bdeb90c8595394c26aaad3.tar.bz2
nixpkgs-1493a31aa6c2bf4da9bdeb90c8595394c26aaad3.tar.lz
nixpkgs-1493a31aa6c2bf4da9bdeb90c8595394c26aaad3.tar.xz
nixpkgs-1493a31aa6c2bf4da9bdeb90c8595394c26aaad3.tar.zst
nixpkgs-1493a31aa6c2bf4da9bdeb90c8595394c26aaad3.zip
Merge pull request #94964 from ggreif/haskell-updates
ghc-8.10.x: add v8.10.2
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/haskell-packages.nix11
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2882abda739..3e85109527e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -79,6 +79,12 @@ in {
       buildLlvmPackages = buildPackages.llvmPackages_9;
       llvmPackages = pkgs.llvmPackages_9;
     };
+    ghc8102 = callPackage ../development/compilers/ghc/8.10.2.nix {
+      bootPkgs = packages.ghc865Binary;
+      inherit (buildPackages.python3Packages) sphinx;
+      buildLlvmPackages = buildPackages.llvmPackages_9;
+      llvmPackages = pkgs.llvmPackages_9;
+    };
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
       bootPkgs = packages.ghc883; # no binary yet
       inherit (buildPackages.python3Packages) sphinx;
@@ -158,6 +164,11 @@ in {
       ghc = bh.compiler.ghc8101;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
     };
+    ghc8102 = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc8102;
+      ghc = bh.compiler.ghc8102;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
+    };
     ghcHEAD = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghcHEAD;
       ghc = bh.compiler.ghcHEAD;