Merge pull request #95262 from NixOS/haskell-updates

Update Haskell package set to LTS 16.9 (plus other fixes)
2020-08-14 21:14:08 +02:00 · 2020-08-14 21:14:08 +02:00 · 00a9d3f261
parent 1f2c19f158 6c5e220501
commit 00a9d3f261
8 changed files with 1735 additions and 901 deletions
--- a/pkgs/development/compilers/ghc/8.10.1.nix
+++ b/pkgs/development/compilers/ghc/8.10.1.nix
@ -99,7 +99,7 @@ stdenv.mkDerivation (rec {
  name = "${targetPrefix}ghc-${version}";

  src = fetchurl {
-    url = "https://downloads.haskell.org/ghc/8.10.1/ghc-${version}-src.tar.xz";
+    url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
    sha256 = "1xgdl6ig5jzli3bg054vfryfkg0y6wggf68g66c32sr67bw0ffsf";
  };

--- a/pkgs/development/compilers/ghc/8.10.2.nix
+++ b/pkgs/development/compilers/ghc/8.10.2.nix
@ -0,0 +1,247 @@
+{ stdenv, pkgsBuildTarget, targetPackages
+
+# build-tools
+, bootPkgs
+, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
+, bash
+
+, libiconv ? null, ncurses
+
+, # GHC can be built with system libffi or a bundled one.
+  libffi ? null
+
+, useLLVM ? !stdenv.targetPlatform.isx86
+, # LLVM is conceptually a run-time-only depedendency, but for
+  # non-x86, we need LLVM to bootstrap later stages, so it becomes a
+  # build-time dependency too.
+  buildLlvmPackages, llvmPackages
+
+, # If enabled, GHC will be built with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+
+, # If enabled, use -fPIC when compiling static libs.
+  enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
+
+  # aarch64 outputs otherwise exceed 2GB limit
+, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64
+
+, # Whether to build dynamic libs for the standard library (on the target
+  # platform). Static libs are always built.
+  enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
+
+, # Whether to build terminfo.
+  enableTerminfo ? !stdenv.targetPlatform.isWindows
+
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+    (if useLLVM then "perf-cross" else "perf-cross-ncg")
+
+, # Whether to disable the large address space allocator
+  # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+  disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
+}:
+
+assert !enableIntegerSimple -> gmp != null;
+
+let
+  inherit (stdenv) buildPlatform hostPlatform targetPlatform;
+
+  inherit (bootPkgs) ghc;
+
+  # TODO(@Ericson2314) Make unconditional
+  targetPrefix = stdenv.lib.optionalString
+    (targetPlatform != hostPlatform)
+    "${targetPlatform.config}-";
+
+  buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
+    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
+    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
+  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+    CrossCompilePrefix = ${targetPrefix}
+    HADDOCK_DOCS = NO
+    BUILD_SPHINX_HTML = NO
+    BUILD_SPHINX_PDF = NO
+  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+    GhcLibWays = "v dyn"
+  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+    GhcLibHcOpts += -fPIC
+    GhcRtsHcOpts += -fPIC
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    EXTRA_CC_OPTS += -std=gnu99
+  '';
+
+  # Splicer will pull out correct variations
+  libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
+    ++ [libffi]
+    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+
+  toolsForTarget = [
+    pkgsBuildTarget.targetPackages.stdenv.cc
+  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+
+  targetCC = builtins.head toolsForTarget;
+
+  # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
+  # see #84670 and #49071 for more background.
+  useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
+
+in
+stdenv.mkDerivation (rec {
+  version = "8.10.2";
+  name = "${targetPrefix}ghc-${version}";
+
+  src = fetchurl {
+    url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
+    sha256 = "02w8n085bw38vyp694j0lfk5wcnwkdaj7hhp0saj71x74533lmww";
+  };
+
+  enableParallelBuilding = true;
+
+  outputs = [ "out" "doc" ];
+
+  postPatch = "patchShebangs .";
+
+  # GHC is a bit confused on its cross terminology.
+  preConfigure = ''
+    for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
+      export "''${env#TARGET_}=''${!env}"
+    done
+    # GHC is a bit confused on its cross terminology, as these would normally be
+    # the *host* tools.
+    export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
+    export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
+    # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
+    export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
+    export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
+    export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
+    export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
+    export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
+    export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
+
+    echo -n "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
+  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+      echo "patching llvm-targets for musl targets..."
+      echo "Cloning these existing '*-linux-gnu*' targets:"
+      grep linux-gnu llvm-targets | sed 's/^/  /'
+      echo "(go go gadget sed)"
+      sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
+      echo "llvm-targets now contains these '*-linux-musl*' targets:"
+      grep linux-musl llvm-targets | sed 's/^/  /'
+
+      echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
+      # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
+      for x in configure aclocal.m4; do
+        substituteInPlace $x \
+          --replace '*-android*|*-gnueabi*)' \
+                    '*-android*|*-gnueabi*|*-musleabi*)'
+      done
+  '';
+
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ]
+    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
+  # `--with` flags for libraries needed for RTS linker
+  configureFlags = [
+    "--datadir=$doc/share/doc/ghc"
+    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+  ] ++ stdenv.lib.optionals (libffi != null) [
+    "--with-system-libffi"
+    "--with-ffi-includes=${targetPackages.libffi.dev}/include"
+    "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
+  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include"
+    "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
+  ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+    "--with-iconv-includes=${libiconv}/include"
+    "--with-iconv-libraries=${libiconv}/lib"
+  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+    "--enable-bootstrap-with-devel-snapshot"
+  ] ++ stdenv.lib.optionals useLdGold [
+    "CFLAGS=-fuse-ld=gold"
+    "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
+    "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
+  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+    "--disable-large-address-space"
+  ];
+
+  # Make sure we never relax`$PATH` and hooks support for compatibility.
+  strictDeps = true;
+
+  # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
+	dontAddExtraLibs = true;
+
+  nativeBuildInputs = [
+    perl autoconf automake m4 python3 sphinx
+    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
+  ];
+
+  # For building runtime libs
+  depsBuildTarget = toolsForTarget;
+
+  buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
+
+  propagatedBuildInputs = [ targetPackages.stdenv.cc ]
+    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+
+  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+
+  checkTarget = "test";
+
+  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+
+  postInstall = ''
+    # Install the bash completion file.
+    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
+
+    # Patch scripts to include "readelf" and "cat" in $PATH.
+    for i in "$out/bin/"*; do
+      test ! -h $i || continue
+      egrep --quiet '^#!' <(head -n 1 $i) || continue
+      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+    done
+  '';
+
+  passthru = {
+    inherit bootPkgs targetPrefix;
+
+    inherit llvmPackages;
+    inherit enableShared;
+
+    # Our Cabal compiler name
+    haskellCompilerName = "ghc-${version}";
+  };
+
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The Glasgow Haskell Compiler";
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    inherit (ghc.meta) license platforms;
+  };
+
+} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+  dontStrip = true;
+  dontPatchELF = true;
+  noAuditTmpdir = true;
+})
--- a/pkgs/development/compilers/ghc/8.8.2.nix
+++ b/pkgs/development/compilers/ghc/8.8.2.nix
@ -94,7 +94,7 @@ stdenv.mkDerivation (rec {
  name = "${targetPrefix}ghc-${version}";

  src = fetchurl {
-    url = "https://downloads.haskell.org/ghc/8.8.2/ghc-${version}-src.tar.xz";
+    url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
    sha256 = "02qa6wgjpxgakg7hv4zfdlrx9k7zxa5i02wnr6y9fsv8j16sbkh1";
  };

--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@ -28,6 +28,9 @@
 , # If enabled, use -fPIC when compiling static libs.
  enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform

+  # aarch64 outputs otherwise exceed 2GB limit
+, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64
+
 , # Whether to build dynamic libs for the standard library (on the target
  # platform). Static libs are always built.
  enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
@ -71,6 +74,8 @@ let
    HADDOCK_DOCS = NO
    BUILD_SPHINX_HTML = NO
    BUILD_SPHINX_PDF = NO
+  '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
+    GhcLibWays = "v dyn"
  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
    GhcLibHcOpts += -fPIC
    GhcRtsHcOpts += -fPIC
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -69,7 +69,7 @@ self: super: {
      name = "git-annex-${super.git-annex.version}-src";
      url = "git://git-annex.branchable.com/";
      rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "vwKcY7Yk+R0YkaXjJ7xKyQWGjySTUPox0xIaurbQZk0=";
+      sha256 = "1d24080xh7gl197i0y5bkn3j94hvh8zqyg9gfcnx2qdlxfca1knb";
    };
  }).override {
    dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -1335,7 +1335,7 @@ self: super: {
          '';
        })).override {
          # we are faster than stack here
-          hie-bios = dontCheck self.hie-bios_0_6_1;
+          hie-bios = dontCheck self.hie-bios_0_6_2;
          lsp-test = dontCheck self.lsp-test_0_11_0_4;
        });

@ -1355,21 +1355,35 @@ self: super: {
      # use a fork of ghcide
      ghcide = self.hls-ghcide;
      # we are faster than stack here
-      hie-bios = dontCheck self.hie-bios_0_6_1;
+      hie-bios = dontCheck self.hie-bios_0_6_2;
      lsp-test = dontCheck self.lsp-test_0_11_0_4;
    };

  # https://github.com/kowainik/policeman/issues/57
  policeman = doJailbreak super.policeman;

-  # 2020-06-29: These three packages have bumped their dependencies for haskell-gi and haskell-gi-base beyond stack-lts.
-  # Choosing a jailbreak, because a version override would rebuild most of the glibverse and the packages still build with the older version.
-  gi-javascriptcore =
-    # Remove these jailbreaks, when assert fails.
-    assert (pkgs.lib.versionOlder super.haskell-gi-base.version "0.24");
-    doJailbreak super.gi-javascriptcore;
-  gi-soup = doJailbreak super.gi-soup;
-  gi-webkit2 = doJailbreak super.gi-webkit2;
+  # 2020-08-14: gi-pango from stackage is to old for the C libs it links against in nixpkgs.
+  # That's why we need to bump a ton of dependency versions to unbreak them.
+  gi-pango = assert super.gi-pango.version == "1.0.22"; self.gi-pango_1_0_23;
+  haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_2) [ pkgs.gobject-introspection ];
+  haskell-gi = assert super.haskell-gi.version == "0.23.1"; self.haskell-gi_0_24_4;
+  gi-cairo = assert super.gi-cairo.version == "1.0.23"; self.gi-cairo_1_0_24;
+  gi-glib = assert super.gi-glib.version == "2.0.23"; self.gi-glib_2_0_24;
+  gi-gobject = assert super.gi-gobject.version == "2.0.22"; self.gi-gobject_2_0_24;
+  gi-atk = assert super.gi-atk.version == "2.0.21"; self.gi-atk_2_0_22;
+  gi-gio = assert super.gi-gio.version == "2.0.26"; self.gi-gio_2_0_27;
+  gi-gdk = assert super.gi-gdk.version == "3.0.22"; self.gi-gdk_3_0_23;
+  gi-gtk = assert super.gi-gtk.version == "3.0.33"; self.gi-gtk_3_0_35;
+  gi-gdkpixbuf = assert super.gi-gdkpixbuf.version == "2.0.23"; self.gi-gdkpixbuf_2_0_24;
+
+  # 2020-08-14: Needs some manual patching to be compatible with haskell-gi-base 0.24
+  # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
+  jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk (pkgs.fetchpatch {
+    url = "https://github.com/ghcjs/jsaddle/compare/9727365...09f44aa.patch";
+    sha256 = "1bkwgmc04544haycb69fqsd97lg24jc7hc1yrin2sgr4l7hz04pf";
+    stripLen = 2;
+    extraPrefix = "";
+  });

  # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
  # https://github.com/lehins/massiv/pull/104
@ -1452,4 +1466,7 @@ self: super: {
    };
  };

+  # https://github.com/bos/statistics/issues/170
+  statistics = dontCheck super.statistics;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@ -72,7 +72,7 @@ default-package-overrides:
  # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
  # not yet available in Nixpkgs
  - gi-gdkx11 < 4
-  # LTS Haskell 16.8
+  # LTS Haskell 16.9
  - abstract-deque ==0.3
  - abstract-par ==0.3.3
  - AC-Angle ==1.0
@ -103,7 +103,7 @@ default-package-overrides:
  - aeson-yak ==0.1.1.3
  - aeson-yaml ==1.0.6.0
  - al ==0.1.4.2
-  - alarmclock ==0.7.0.4
+  - alarmclock ==0.7.0.5
  - alerts ==0.1.2.0
  - alex ==3.2.5
  - alg ==0.2.13.1
@ -244,7 +244,7 @@ default-package-overrides:
  - asn1-parse ==0.9.5
  - asn1-types ==0.3.4
  - assert-failure ==0.1.2.3
-  - assoc ==1.0.1
+  - assoc ==1.0.2
  - astro ==0.4.2.1
  - async ==2.2.2
  - async-extra ==0.2.0.0
@ -271,7 +271,7 @@ default-package-overrides:
  - avers ==0.0.17.1
  - avro ==0.5.2.0
  - aws-cloudfront-signed-cookies ==0.2.0.6
-  - bank-holidays-england ==0.2.0.4
+  - bank-holidays-england ==0.2.0.5
  - base16 ==0.2.1.0
  - base16-bytestring ==0.1.1.7
  - base16-lens ==0.1.2.0
@ -518,9 +518,9 @@ default-package-overrides:
  - control-monad-omega ==0.3.2
  - convertible ==1.1.1.0
  - cookie ==0.4.5
-  - core-data ==0.2.1.7
-  - core-program ==0.2.4.4
-  - core-text ==0.2.3.5
+  - core-data ==0.2.1.8
+  - core-program ==0.2.4.5
+  - core-text ==0.2.3.6
  - countable ==1.0
  - cpio-conduit ==0.7.0
  - cpphs ==1.20.9.1
@ -699,7 +699,7 @@ default-package-overrides:
  - editor-open ==0.6.0.0
  - egison ==4.0.3
  - egison-pattern-src ==0.2.1.0
-  - egison-pattern-src-th-mode ==0.2.1.0
+  - egison-pattern-src-th-mode ==0.2.1.1
  - either ==5.0.1.1
  - either-both ==0.1.1.1
  - either-unwrap ==1.1
@ -777,7 +777,7 @@ default-package-overrides:
  - feed ==1.3.0.1
  - FenwickTree ==0.1.2.1
  - fft ==0.1.8.6
-  - fgl ==5.7.0.2
+  - fgl ==5.7.0.3
  - filecache ==0.4.1
  - file-embed ==0.0.11.2
  - file-embed-lzma ==0
@ -902,9 +902,9 @@ default-package-overrides:
  - ghcid ==0.8.7
  - ghci-hexcalc ==0.1.1.0
  - ghcjs-codemirror ==0.0.0.2
-  - ghc-lib ==8.10.1.20200523
-  - ghc-lib-parser ==8.10.1.20200523
-  - ghc-lib-parser-ex ==8.10.0.15
+  - ghc-lib ==8.10.2.20200808
+  - ghc-lib-parser ==8.10.2.20200808
+  - ghc-lib-parser-ex ==8.10.0.16
  - ghc-parser ==0.2.2.0
  - ghc-paths ==0.1.0.12
  - ghc-prof ==1.4.1.7
@ -936,7 +936,7 @@ default-package-overrides:
  - gi-pango ==1.0.22
  - giphy-api ==0.7.0.0
  - githash ==0.1.4.0
-  - github-rest ==1.0.2
+  - github-rest ==1.0.3
  - github-types ==0.2.1
  - gitlab-haskell ==0.1.8
  - gitrev ==1.3.1
@ -957,7 +957,7 @@ default-package-overrides:
  - graph-core ==0.3.0.0
  - graphite ==0.10.0.1
  - graphs ==0.7.1
-  - graphviz ==2999.20.0.4
+  - graphviz ==2999.20.1.0
  - graph-wrapper ==0.2.6.0
  - gravatar ==0.8.0
  - greskell ==1.1.0.3
@ -1027,7 +1027,7 @@ default-package-overrides:
  - hedgehog-fakedata ==0.0.1.3
  - hedgehog-fn ==1.0
  - hedgehog-quickcheck ==0.1.1
-  - hedis ==0.12.13
+  - hedis ==0.12.14
  - here ==1.2.13
  - heredoc ==0.2.0.0
  - heterocephalus ==1.0.5.3
@ -1081,7 +1081,7 @@ default-package-overrides:
  - hsebaysdk ==0.4.1.0
  - hsemail ==2.2.0
  - hset ==2.2.0
-  - hs-functors ==0.1.6.0
+  - hs-functors ==0.1.7.1
  - hs-GeoIP ==0.3
  - hsini ==0.5.1.2
  - hsinstall ==2.6
@ -1103,7 +1103,7 @@ default-package-overrides:
  - hspec-expectations ==0.8.2
  - hspec-expectations-lifted ==0.10.0
  - hspec-expectations-pretty-diff ==0.7.2.5
-  - hspec-golden ==0.1.0.2
+  - hspec-golden ==0.1.0.3
  - hspec-golden-aeson ==0.7.0.0
  - hspec-hedgehog ==0.0.1.2
  - hspec-leancheck ==0.0.4
@ -1229,8 +1229,8 @@ default-package-overrides:
  - intro ==0.7.0.0
  - intset-imperative ==0.1.0.0
  - invariant ==0.5.3
-  - invertible ==0.2.0.6
-  - invertible-grammar ==0.1.2
+  - invertible ==0.2.0.7
+  - invertible-grammar ==0.1.3
  - io-machine ==0.2.0.0
  - io-manager ==0.1.0.2
  - io-memoize ==1.1.1.0
@ -1398,7 +1398,7 @@ default-package-overrides:
  - matplotlib ==0.7.5
  - matrices ==0.5.0
  - matrix ==0.3.6.1
-  - matrix-as-xyz ==0.1.1.3
+  - matrix-as-xyz ==0.1.2.2
  - matrix-market-attoparsec ==0.1.1.3
  - matrix-static ==0.3
  - maximal-cliques ==0.1.1
@ -1445,7 +1445,7 @@ default-package-overrides:
  - miso ==1.6.0.0
  - missing-foreign ==0.1.1
  - MissingH ==1.4.3.0
-  - mixed-types-num ==0.4.0.1
+  - mixed-types-num ==0.4.0.2
  - mixpanel-client ==0.2.1
  - mltool ==0.2.0.1
  - mmap ==0.5.9
@ -1558,7 +1558,7 @@ default-package-overrides:
  - nonce ==1.0.7
  - nondeterminism ==1.4
  - non-empty ==0.3.2
-  - nonempty-containers ==0.3.3.0
+  - nonempty-containers ==0.3.4.0
  - nonemptymap ==0.0.6.0
  - non-empty-sequence ==0.2.0.4
  - nonempty-vector ==0.2.0.2
@ -1589,7 +1589,7 @@ default-package-overrides:
  - OneTuple ==0.2.2.1
  - Only ==0.1
  - oo-prototypes ==0.1.0.0
-  - opaleye ==0.6.7004.2
+  - opaleye ==0.6.7005.0
  - OpenAL ==1.7.0.5
  - open-browser ==0.2.1.0
  - openexr-write ==0.1.0.2
@ -1628,7 +1628,7 @@ default-package-overrides:
  - pandoc-plot ==0.6.1.0
  - pandoc-pyplot ==2.3.0.1
  - pandoc-types ==1.20
-  - pantry ==0.4.0.1
+  - pantry ==0.4.0.2
  - papillon ==0.1.1.1
  - parallel ==3.2.2.0
  - parallel-io ==0.3.3
@ -1681,7 +1681,7 @@ default-package-overrides:
  - pg-transact ==0.3.1.1
  - phantom-state ==0.2.1.2
  - pid1 ==0.1.2.0
-  - pipes ==4.3.13
+  - pipes ==4.3.14
  - pipes-aeson ==0.4.1.8
  - pipes-attoparsec ==0.5.1.5
  - pipes-binary ==0.4.2
@ -1886,9 +1886,9 @@ default-package-overrides:
  - rhine ==0.6.0
  - rhine-gloss ==0.6.0.1
  - rigel-viz ==0.2.0.0
-  - rio ==0.1.17.0
+  - rio ==0.1.18.0
  - rio-orphans ==0.1.1.0
-  - rio-prettyprint ==0.1.0.0
+  - rio-prettyprint ==0.1.1.0
  - roc-id ==0.1.0.0
  - rocksdb-haskell ==1.0.1
  - rocksdb-query ==0.3.2
@ -2062,7 +2062,7 @@ default-package-overrides:
  - special-values ==0.1.0.0
  - speculate ==0.4.2
  - speedy-slice ==0.3.1
-  - Spintax ==0.3.4
+  - Spintax ==0.3.5
  - splice ==0.6.1.1
  - split ==0.2.3.4
  - splitmix ==0.0.5
@ -2123,7 +2123,7 @@ default-package-overrides:
  - structs ==0.1.3
  - structured ==0.1
  - structured-cli ==2.5.2.0
-  - stylish-haskell ==0.11.0.0
+  - stylish-haskell ==0.11.0.3
  - summoner ==2.0.1.1
  - summoner-tui ==2.0.1.1
  - sum-type-boilerplate ==0.1.1
@ -2138,7 +2138,7 @@ default-package-overrides:
  - syb ==0.7.1
  - symbol ==0.2.4
  - symengine ==0.1.2.0
-  - symmetry-operations-symbols ==0.0.1.4
+  - symmetry-operations-symbols ==0.0.2.1
  - sysinfo ==0.1.1
  - system-argv0 ==0.1.1
  - systemd ==2.3.0
@ -2476,7 +2476,7 @@ default-package-overrides:
  - xdg-userdirs ==0.1.0.2
  - xeno ==0.4.1
  - xls ==0.1.3
-  - xlsx ==0.8.0
+  - xlsx ==0.8.1
  - xlsx-tabular ==0.2.2.1
  - xml ==1.3.14
  - xml-basic ==0.1.3.1
@ -2500,11 +2500,11 @@ default-package-overrides:
  - xxhash-ffi ==0.2.0.0
  - yaml ==0.11.4.0
  - yamlparse-applicative ==0.1.0.1
-  - yesod ==1.6.0.2
+  - yesod ==1.6.1.0
  - yesod-auth ==1.6.10
  - yesod-auth-fb ==1.10.1
  - yesod-auth-hashdb ==1.7.1.2
-  - yesod-bin ==1.6.0.5
+  - yesod-bin ==1.6.0.6
  - yesod-core ==1.6.18
  - yesod-fb ==0.6.1
  - yesod-form ==1.6.7
@ -2532,7 +2532,7 @@ default-package-overrides:
  - zip-archive ==0.4.1
  - zippers ==0.3
  - zip-stream ==0.2.0.1
-  - zlib ==0.6.2.1
+  - zlib ==0.6.2.2
  - zlib-bindings ==0.1.1.5
  - zlib-lens ==0.1.2.1
  - zot ==0.0.3
@ -2560,6 +2560,8 @@ extra-packages:
  - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
  - dhall == 1.29.0                     # required for spago 0.14.0.
  - doctemplates == 0.8                 # required by pandoc-2.9.x
+  - gi-gdk == 3.0.23                    # required for gi-pango 1.0.23
+  - gi-gtk == 3.0.35                    # required for gi-pango 1.0.23
  - generic-deriving == 1.10.5.*        # new versions don't compile with GHC 7.10.x
  - ghc-check == 0.3.0.1                # only version compatible with ghcide 0.2.0
  - ghc-tcplugins-extra ==0.3.2         # required for polysemy-plugin 0.2.5.0
@ -2647,7 +2649,9 @@ package-maintainers:
    # - pipes-mongodb
    - streaming-wai
  kiwi:
+    - Unique
    - glirc
+    - matterhorn
    - mattermost-api
    - mattermost-api-qc
  psibi:
@ -2991,6 +2995,7 @@ broken-packages:
  - AMI
  - ampersand
  - amqp-conduit
+  - amqp-streamly
  - analyze
  - analyze-client
  - anansi-pandoc
@ -3906,6 +3911,7 @@ broken-packages:
  - collections-api
  - collections-base-instances
  - colonnade
+  - Color
  - color-counter
  - colorless
  - colorless-http-client
@ -4082,6 +4088,7 @@ broken-packages:
  - CoreDump
  - CoreErlang
  - CoreFoundation
+  - corenlp-parser
  - Coroutine
  - coroutine-enumerator
  - coroutine-iteratee
@ -4162,6 +4169,12 @@ broken-packages:
  - crystalfontz
  - cse-ghc-plugin
  - csg
+  - csound-catalog
+  - csound-expression
+  - csound-expression-dynamic
+  - csound-expression-opcodes
+  - csound-expression-typed
+  - csound-sampler
  - CSPM-cspm
  - CSPM-FiringRules
  - CSPM-Frontend
@ -4190,6 +4203,7 @@ broken-packages:
  - curve25519
  - curves
  - custom-prelude
+  - cut-the-crap
  - CV
  - cv-combinators
  - cypher
@ -4240,6 +4254,7 @@ broken-packages:
  - data-filepath
  - data-fin
  - data-fin-simple
+  - data-fix-cse
  - data-flagset
  - data-forest
  - data-ivar
@ -4394,6 +4409,7 @@ broken-packages:
  - dgim
  - dgs
  - dhall-check
+  - dhall-docs
  - dhall-fly
  - dhall-nix
  - dhall-text
@ -4711,6 +4727,7 @@ broken-packages:
  - EnumMap
  - enummapmap
  - enummapset-th
+  - env-extra
  - env-parser
  - envstatus
  - epanet-haskell
@ -4742,10 +4759,6 @@ broken-packages:
  - EsounD
  - espial
  - ess
-  - essence-of-live-coding
-  - essence-of-live-coding-gloss
-  - essence-of-live-coding-pulse
-  - essence-of-live-coding-quickcheck
  - estimators
  - EstProgress
  - estreps
@ -4956,7 +4969,6 @@ broken-packages:
  - findhttp
  - fingertree-psqueue
  - fingertree-tf
-  - finitary
  - finitary-derive
  - finitary-optics
  - FiniteMap
@ -5307,28 +5319,6 @@ broken-packages:
  - ghcprofview
  - ght
  - gi-cairo-again
-  - gi-ggit
-  - gi-girepository
-  - gi-graphene
-  - gi-gsk
-  - gi-gst
-  - gi-gstaudio
-  - gi-gstbase
-  - gi-gstpbutils
-  - gi-gsttag
-  - gi-gstvideo
-  - gi-gtkosxapplication
-  - gi-gtksource
-  - gi-handy
-  - gi-harfbuzz
-  - gi-ibus
-  - gi-notify
-  - gi-ostree
-  - gi-pangocairo
-  - gi-poppler
-  - gi-secret
-  - gi-vte
-  - gi-wnck
  - giak
  - Gifcurry
  - ginsu
@ -5543,6 +5533,8 @@ broken-packages:
  - gtfs
  - gtfs-realtime
  - gtk-serialized-event
+  - gtk-sni-tray
+  - gtk-strut
  - gtk-toy
  - gtk2hs-hello
  - gtk2hs-rpn
@ -6784,6 +6776,7 @@ broken-packages:
  - inilist
  - initialize
  - inject-function
+  - inline-asm
  - inline-java
  - inline-r
  - inserts
@ -6819,7 +6812,6 @@ broken-packages:
  - introduction
  - introduction-test
  - intset
-  - invertible-grammar
  - invertible-hlist
  - invertible-syntax
  - io-capture
@ -7575,6 +7567,9 @@ broken-packages:
  - marxup
  - masakazu-bot
  - MASMGen
+  - massiv
+  - massiv-io
+  - massiv-test
  - master-plan
  - matchable
  - matchable-th
@ -7592,7 +7587,6 @@ broken-packages:
  - matrix-market
  - matrix-sized
  - matsuri
-  - matterhorn
  - maude
  - maxent
  - maxent-learner-hw
@ -8198,6 +8192,7 @@ broken-packages:
  - om-actor
  - om-elm
  - om-fail
+  - om-http-logging
  - omaketex
  - ombra
  - Omega
@ -8494,6 +8489,7 @@ broken-packages:
  - pg-store
  - pg-transact
  - pgdl
+  - pgf2
  - pgsql-simple
  - pgstream
  - phasechange
@ -8580,6 +8576,7 @@ broken-packages:
  - plat
  - platinum-parsing
  - PlayingCards
+  - plex
  - plist
  - plist-buddy
  - plocketed
@ -9347,6 +9344,7 @@ broken-packages:
  - scgi
  - schedevr
  - schedule-planner
+  - scheduler
  - schedyield
  - schema
  - schemas
@ -9407,6 +9405,7 @@ broken-packages:
  - secure-sockets
  - secureUDP
  - sednaDBXML
+  - seitz-symbol
  - selectors
  - SelectSequencesFromMSA
  - selenium
@ -9523,7 +9522,6 @@ broken-packages:
  - setoid
  - setters
  - sexp
-  - sexp-grammar
  - sexpr-parser
  - sext
  - SFML
@ -10003,6 +10001,8 @@ broken-packages:
  - streamproc
  - strelka
  - strict-data
+  - strict-lens
+  - strict-optics
  - strict-tuple-lens
  - StrictBench
  - StrictCheck
@ -10081,6 +10081,7 @@ broken-packages:
  - swearjure
  - swf
  - swift-lda
+  - swiss-ephemeris
  - sws
  - syb-extras
  - syb-with-class-instances-text
@ -10139,6 +10140,7 @@ broken-packages:
  - Tablify
  - tabloid
  - tabs
+  - taffybar
  - tag-bits
  - tag-stream
  - tagged-exception-core
@ -10249,6 +10251,7 @@ broken-packages:
  - test-simple
  - testbench
  - testCom
+  - testcontainers
  - TestExplode
  - testloop
  - testpack
@ -10623,7 +10626,6 @@ broken-packages:
  - uniform-io
  - union
  - union-map
-  - Unique
  - uniqueid
  - uniquely-represented-sets
  - units-attoparsec
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- 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;