Merge branch 'master' into staging

This apparently fixes some broken src fetches (gnuradio, twisted).

59 files changed, 1375 insertions, 762 deletions

diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix
index 291b0ed013d6..c27f2a226705 100644
--- a/pkgs/development/compilers/ecl/16.1.2.nix
+++ b/pkgs/development/compilers/ecl/16.1.2.nix
@@ -53,6 +53,14 @@ stdenv.mkDerivation {
       url = "https://gitlab.com/embeddable-common-lisp/ecl/commit/caba1989f40ef917e7486f41b9cd5c7e3c5c2d79.patch";
       sha256 = "07vw91psbc9gdn8grql46ra8lq3bgkzg5v480chnbryna4sv6lbb";
     })
+    (fetchpatch {
+      # Fix getcwd with long pathnames
+      # Rebased version of
+      # https://gitlab.com/embeddable-common-lisp/ecl/commit/ac5f011f57a85a38627af154bc3ee7580e7fecd4.patch
+      name = "getcwd.patch";
+      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/16.1.2-getcwd.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      sha256 = "1fbi8gn7rv8nqff5mpaijsrch3k3z7qc5cn4h1vl8qrr8xwqlqhb";
+    })
   ];
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
new file mode 100644
index 000000000000..51b79ed6bb11
--- /dev/null
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -0,0 +1,210 @@
+{ stdenv, targetPackages
+, buildPlatform, hostPlatform, targetPlatform
+
+# build-tools
+, bootPkgs, alex, happy, hscolour
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
+
+, libffi, libiconv ? null, ncurses
+
+, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl
+, # 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 ? !(gmp.meta.available or false), gmp
+
+, # If enabled, use -fPIC when compiling static libs.
+  enableRelocatedStaticLibs ? targetPlatform != hostPlatform
+
+, # Whether to build dynamic libs for the standard library (on the target
+  # platform). Static libs are always built.
+  enableShared ? !targetPlatform.isWindows && !targetPlatform.useiOSPrebuilt
+
+, # Whetherto build terminfo.
+  enableTerminfo ? !targetPlatform.isWindows
+
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
+}:
+
+let
+  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"}
+  '' + stdenv.lib.optionalString enableIntegerSimple ''
+    INTEGER_LIBRARY = integer-simple
+  '' + 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 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 ]
+    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+
+  toolsForTarget =
+    if hostPlatform == buildPlatform then
+      [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm
+    else assert targetPlatform == hostPlatform; # build != host == target
+      [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+
+  targetCC = builtins.head toolsForTarget;
+
+in
+stdenv.mkDerivation (rec {
+  version = "8.6.0.20180627";
+  name = "${targetPrefix}ghc-${version}";
+
+  src = fetchurl {
+    url = "https://downloads.haskell.org/~ghc/8.6.1-alpha1/ghc-${version}-src.tar.xz";
+    sha256 = "0vmki10ypdhca3nykxz3lgarr14mfanfkif43m1s2p1q0b1z576n";
+  };
+
+  enableParallelBuilding = true;
+
+  outputs = [ "out" "doc" ];
+
+  patches = stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
+
+  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 targetPlatform.isAarch32 ".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
+  '';
+
+  # 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.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
+    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+  ] ++ stdenv.lib.optional (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 (targetPlatform.isAarch32) [
+    "CFLAGS=-fuse-ld=gold"
+    "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
+    "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
+  ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
+    # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+    "--disable-large-address-space"
+  ];
+
+  # Make sure we never relax`$PATH` and hooks support for compatability.
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    perl autoconf automake m4 python3
+    ghc alex happy hscolour
+  ];
+
+  # For building runtime libs
+  depsBuildTarget = toolsForTarget;
+
+  buildInputs = 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" ];
+
+  postInstall = ''
+    for bin in "$out"/lib/${name}/bin/*; do
+      isELF "$bin" || continue
+      paxmark m "$bin"
+    done
+
+    # 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-8.4.3";
+  };
+
+  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;
+})
diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix
index 8b5d14e7f5fb..7f22f4de6244 100644
--- a/pkgs/development/compilers/polyml/5.6.nix
+++ b/pkgs/development/compilers/polyml/5.6.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     longDescription = ''
       Poly/ML is a full implementation of Standard ML.
     '';
-    homepage = http://www.polyml.org/;
+    homepage = https://www.polyml.org/;
     license = stdenv.lib.licenses.lgpl21;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = [ #Add your name here!
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index de5b85055273..b7feed84c37f 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     longDescription = ''
       Poly/ML is a full implementation of Standard ML.
     '';
-    homepage = http://www.polyml.org/;
+    homepage = https://www.polyml.org/;
     license = licenses.lgpl21;
     platforms = with platforms; (linux ++ darwin);
     maintainers = with maintainers; [ z77z yurrriq ];
diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix
index b1100eb8aa9d..a1f803b67193 100644
--- a/pkgs/development/compilers/scala/2.11.nix
+++ b/pkgs/development/compilers/scala/2.11.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       Code sizes are typically reduced by a factor of two to three when
       compared to an equivalent Java application.
     '';
-    homepage = http://www.scala-lang.org/;
+    homepage = https://www.scala-lang.org/;
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.all;
     branch = "2.11";
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6cc6945bae4d..966334f1e45c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1063,11 +1063,16 @@ self: super: {
   });
 
   # dhall-json requires a very particular dhall version
-  dhall-json_1_2_0 = super.dhall-json_1_2_0.override { dhall = self.dhall_1_14_0; };
+  dhall-json_1_2_1 = super.dhall-json_1_2_1.override { dhall = self.dhall_1_14_0; };
 
   # https://github.com/fpco/streaming-commons/issues/49
   streaming-commons = dontCheck super.streaming-commons;
 
+  # cabal2nix generates a dependency on base-compat, which is the wrong version
+  base-compat-batteries = super.base-compat-batteries.override {
+    base-compat = super.base-compat_0_10_1;
+  };
+
 }
 
 //
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 1e48971b6fbe..736be056e0e7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -23,6 +23,7 @@ self: super: {
   ghc-prim = null;
   ghci = null;
   haskeline = null;
+  hoopl = self.hoopl_3_10_2_2;   # no longer a core library in GHC 8.4.x
   hpc = null;
   integer-gmp = null;
   mtl = null;
@@ -396,9 +397,9 @@ self: super: {
   dhall_1_13_0 = doJailbreak super.dhall_1_14_0;  # support ansi-terminal 0.8.x
   HaTeX = self.HaTeX_3_19_0_0;
   hpack = self.hpack_0_28_2;
-  hspec = dontCheck super.hspec_2_5_1;
-  hspec-core = dontCheck super.hspec-core_2_5_1;
-  hspec-discover = self.hspec-discover_2_5_1;
+  hspec = dontCheck super.hspec_2_5_3;
+  hspec-core = dontCheck super.hspec-core_2_5_3;
+  hspec-discover = self.hspec-discover_2_5_3;
   hspec-smallcheck = self.hspec-smallcheck_0_5_2;
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_2_1;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d87a84c3c778..bc2412aca11a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.14
+  # LTS Haskell 11.15
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -445,7 +445,7 @@ default-package-overrides:
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
-  - conduit ==1.3.0.2
+  - conduit ==1.3.0.3
   - conduit-algorithms ==0.0.8.1
   - conduit-combinators ==1.3.0
   - conduit-connection ==0.1.0.4
@@ -843,7 +843,7 @@ default-package-overrides:
   - github-webhooks ==0.9.1
   - gitrev ==1.3.1
   - gl ==0.8.0
-  - glabrous ==0.3.5
+  - glabrous ==0.3.6
   - glaze ==0.3.0.1
   - glazier ==0.11.0.1
   - glazier-pipes ==0.1.5.1
@@ -921,7 +921,7 @@ default-package-overrides:
   - haskell-src ==1.0.3.0
   - haskell-src-exts ==1.20.2
   - haskell-src-exts-util ==0.2.3
-  - haskell-src-meta ==0.8.0.2
+  - haskell-src-meta ==0.8.0.3
   - haskell-tools-ast ==1.0.1.1
   - haskell-tools-backend-ghc ==1.0.1.1
   - haskell-tools-prettyprint ==1.0.1.1
@@ -1173,7 +1173,7 @@ default-package-overrides:
   - ip ==1.2.1
   - ip6addr ==0.5.3
   - iproute ==1.7.5
-  - IPv6Addr ==1.0.3
+  - IPv6Addr ==1.0.4
   - IPv6DB ==0.2.6
   - ipython-kernel ==0.9.0.2
   - irc ==0.6.1.0
@@ -1284,7 +1284,7 @@ default-package-overrides:
   - linear-accelerate ==0.5.0.1
   - linked-list-with-iterator ==0.1.1.0
   - linux-file-extents ==0.2.0.0
-  - linux-namespaces ==0.1.2.0
+  - linux-namespaces ==0.1.3.0
   - List ==0.6.2
   - ListLike ==4.6
   - listsafe ==0.1.0.1
@@ -1456,7 +1456,7 @@ default-package-overrides:
   - mysql-haskell-openssl ==0.8.3.0
   - mysql-simple ==0.4.5
   - nagios-check ==0.3.2
-  - names-th ==0.2.0.4
+  - names-th ==0.2.0.5
   - nano-erl ==0.1.0.1
   - nanospec ==0.2.2
   - naqsha ==0.2.0.1
@@ -1596,8 +1596,8 @@ default-package-overrides:
   - pem ==0.2.4
   - perf ==0.3.1.1
   - perfect-hash-generator ==0.2.0.6
-  - persistable-record ==0.6.0.3
-  - persistable-types-HDBC-pg ==0.0.3.2
+  - persistable-record ==0.6.0.4
+  - persistable-types-HDBC-pg ==0.0.3.3
   - persistent ==2.8.2
   - persistent-mongoDB ==2.8.0
   - persistent-mysql ==2.8.1
@@ -1718,7 +1718,7 @@ default-package-overrides:
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.11.1.2
   - pushbullet-types ==0.4.1.0
-  - pusher-http-haskell ==1.5.1.4
+  - pusher-http-haskell ==1.5.1.5
   - pwstore-fast ==2.4.4
   - qchas ==1.1.0.0
   - qm-interpolated-string ==0.3.0.0
@@ -1790,13 +1790,13 @@ default-package-overrides:
   - regex-pcre-builtin ==0.94.4.8.8.35
   - regex-pcre-text ==0.94.0.1
   - regex-posix ==0.95.2
-  - regex-tdfa ==1.2.3
+  - regex-tdfa ==1.2.3.1
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
-  - relational-query ==0.11.1.0
-  - relational-query-HDBC ==0.6.7.1
-  - relational-record ==0.2.1.2
-  - relational-schemas ==0.1.6.1
+  - relational-query ==0.11.4.0
+  - relational-query-HDBC ==0.6.8.0
+  - relational-record ==0.2.2.0
+  - relational-schemas ==0.1.6.2
   - rematch ==0.2.0.0
   - renderable ==0.2.0.1
   - repa ==3.4.1.3
@@ -1817,9 +1817,9 @@ default-package-overrides:
   - retry ==0.7.6.2
   - rev-state ==0.1.2
   - rfc5051 ==0.1.0.3
-  - riak ==1.1.2.4
+  - riak ==1.1.2.5
   - riak-protobuf ==0.23.0.0
-  - rio ==0.1.2.0
+  - rio ==0.1.3.0
   - rng-utils ==0.3.0
   - roles ==0.2.0.0
   - rollbar-hs ==0.2.0.0
@@ -1843,8 +1843,8 @@ default-package-overrides:
   - say ==0.1.0.0
   - sbp ==2.3.16
   - sbv ==7.5
-  - scalendar ==1.2.0
   - SCalendar ==1.1.0
+  - scalendar ==1.2.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1884,7 +1884,7 @@ default-package-overrides:
   - servant-elm ==0.4.0.1
   - servant-exceptions ==0.1.1
   - servant-foreign ==0.11.1
-  - servant-generic ==0.1.0.1
+  - servant-generic ==0.1.0.2
   - servant-github-webhook ==0.4.1.0
   - servant-js ==0.9.3.2
   - servant-JuicyPixels ==0.3.0.3
@@ -1981,7 +1981,7 @@ default-package-overrides:
   - spoon ==0.3.1
   - spreadsheet ==0.1.3.7
   - sqlite-simple ==0.4.16.0
-  - sql-words ==0.1.6.1
+  - sql-words ==0.1.6.2
   - squeal-postgresql ==0.1.1.4
   - srcloc ==0.5.1.2
   - stache ==1.2.1
@@ -2063,7 +2063,7 @@ default-package-overrides:
   - tagsoup ==0.14.6
   - tagstream-conduit ==0.5.5.3
   - tar ==0.5.1.0
-  - tar-conduit ==0.2.3
+  - tar-conduit ==0.2.3.1
   - tardis ==0.4.1.0
   - tasty ==1.0.1.1
   - tasty-ant-xml ==1.1.4
@@ -2071,7 +2071,7 @@ default-package-overrides:
   - tasty-dejafu ==1.1.0.2
   - tasty-discover ==4.2.1
   - tasty-expected-failure ==0.11.1.1
-  - tasty-golden ==2.3.1.3
+  - tasty-golden ==2.3.2
   - tasty-hedgehog ==0.1.0.2
   - tasty-hspec ==1.1.4
   - tasty-html ==0.4.1.1
@@ -2116,7 +2116,7 @@ default-package-overrides:
   - textlocal ==0.1.0.5
   - text-manipulate ==0.2.0.1
   - text-metrics ==0.3.0
-  - text-postgresql ==0.0.3.0
+  - text-postgresql ==0.0.3.1
   - text-printer ==0.5
   - text-region ==0.3.1.0
   - text-short ==0.1.2
@@ -2125,7 +2125,7 @@ default-package-overrides:
   - text-zipper ==0.10.1
   - tfp ==1.0.0.2
   - tf-random ==0.5
-  - th-abstraction ==0.2.6.0
+  - th-abstraction ==0.2.7.0
   - th-data-compat ==0.0.2.6
   - th-desugar ==1.7
   - these ==0.7.4
@@ -2196,7 +2196,7 @@ default-package-overrides:
   - tuple ==0.3.0.2
   - tuples-homogenous-h98 ==0.1.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.5.8
+  - turtle ==1.5.9
   - turtle-options ==0.1.0.4
   - type-assertions ==0.1.0.0
   - type-combinators ==0.2.4.3
@@ -2215,7 +2215,7 @@ default-package-overrides:
   - typography-geometry ==1.0.0.1
   - tz ==0.1.3.1
   - tzdata ==0.1.20180122.0
-  - ua-parser ==0.7.4.1
+  - ua-parser ==0.7.5.0
   - uglymemo ==0.1.0.1
   - unbounded-delays ==0.1.1.0
   - unbound-generics ==0.3.3
@@ -2232,8 +2232,8 @@ default-package-overrides:
   - union-find ==0.2
   - uniplate ==1.6.12
   - uniq-deep ==1.1.0.0
-  - Unique ==0.4.7.2
   - unique ==0
+  - Unique ==0.4.7.2
   - unit-constraint ==0.0.0
   - units-parser ==0.1.1.2
   - universe ==1.0
@@ -2251,6 +2251,7 @@ default-package-overrides:
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
   - unsafe ==0.0
+  - uom-plugin ==0.3.0.0
   - uri-bytestring ==0.3.2.0
   - uri-bytestring-aeson ==0.1.0.6
   - uri-encode ==1.5.0.5
@@ -2355,8 +2356,8 @@ default-package-overrides:
   - weigh ==0.0.12
   - wide-word ==0.1.0.6
   - wikicfp-scraper ==0.1.0.9
-  - wild-bind ==0.1.2.0
-  - wild-bind-x11 ==0.2.0.3
+  - wild-bind ==0.1.2.1
+  - wild-bind-x11 ==0.2.0.4
   - Win32-notify ==0.3.0.3
   - wire-streams ==0.1.1.0
   - withdependencies ==0.2.4.2
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index a9f21040ac0c..54366046222d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -516,9 +516,4 @@ self: super: builtins.intersectAttrs super {
   # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
   blank-canvas = dontCheck super.blank-canvas;
   blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
-
-  # cabal2nix generates a dependency on base-compat, which is the wrong version
-  base-compat-batteries = super.base-compat-batteries.override {
-    base-compat = super.base-compat_0_10_1;
-  };
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e5d713ac4c30..2a60e3b71e0e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10210,24 +10210,6 @@ self: {
      }:
      mkDerivation {
        pname = "IPv6Addr";
-       version = "1.0.3";
-       sha256 = "17bk63qi9krfghplrmck4v1hv54kwdppl50hfm7349dqfhdbf129";
-       libraryHaskellDepends = [
-         aeson attoparsec base iproute network network-info random text
-       ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit text
-       ];
-       description = "Library to deal with IPv6 address text representations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "IPv6Addr_1_0_4" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
-     , network-info, random, test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "IPv6Addr";
        version = "1.0.4";
        sha256 = "1hgb0jygywhz74mndbk94v7pw9h4wfy902wxhnhdd9rb51dcb0d9";
        libraryHaskellDepends = [
@@ -10238,7 +10220,6 @@ self: {
        ];
        description = "Library to deal with IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IPv6DB" = callPackage
@@ -10351,6 +10332,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "IntGraph" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "IntGraph";
+       version = "0.1.0.0";
+       sha256 = "0b7hycjl4mrs47377h4yisy1kcypz7im9x0rs6w0jblczf7gmk46";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers ];
+       description = "Dynamically sized graph library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Interpolation" = callPackage
     ({ mkDerivation, base, haskell-src-meta, syb, template-haskell }:
      mkDerivation {
@@ -11166,8 +11159,8 @@ self: {
      }:
      mkDerivation {
        pname = "LambdaHack";
-       version = "0.8.1.2";
-       sha256 = "0bad3l413rab2r17j7hqzfypnyf2gmmffzfy1bvpdh3r8xrc5z1d";
+       version = "0.8.3.0";
+       sha256 = "0v07c8v7l8yg111fysl735scsbsl9l6q3vzigy7rv05sjfl276ss";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -14474,8 +14467,8 @@ self: {
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.12.2.1";
-       sha256 = "0wxz9skscs72bxb2fac82pyn1wkcxc666l40s42q32rbq17d9x44";
+       version = "0.12.2.2";
+       sha256 = "07zxn4gqkmprrpfyd8vvsf4c2350965k029nzvs0zvrwfbkxin4m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14994,8 +14987,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "QuickCheckVariant";
-       version = "1.0.0.0";
-       sha256 = "0gxq90fh1bgy2vcpyzbdgnly7q88bbqx06dq44rmv3fwjs61rc82";
+       version = "1.0.0.1";
+       sha256 = "12yxavf2bcd6cpf09j4d97myks4v34jki5hqjl9kcwar8k8j8gls";
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Generator of \"valid\" and \"invalid\" data in a type class";
@@ -27431,14 +27424,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "apecs_0_4_0_0" = callPackage
+  "apecs_0_4_0_1" = callPackage
     ({ mkDerivation, async, base, containers, criterion, linear, mtl
      , QuickCheck, template-haskell, vector
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.4.0.0";
-       sha256 = "0wpjs90q9nwknbn6shk7bazc0kdhllhvg13432h2hckqbmrfp836";
+       version = "0.4.0.1";
+       sha256 = "03dbjvsnfh6zlms4v6djq7y8bxfwk80nnprrrmrj5crxr5mll4xg";
        libraryHaskellDepends = [
          async base containers mtl template-haskell vector
        ];
@@ -30278,8 +30271,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.11.0.7";
-       sha256 = "1jslvfsp1mraills55z1kxnf3x2csx9qn9r7ccsyyl2bimzj9yq6";
+       version = "2.11.0.8";
+       sha256 = "1nk802nm3s5dygk1ldhn4djxwz9priqsm3hpd9wkb6pd80w945m5";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -33924,6 +33917,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bench_1_0_10" = callPackage
+    ({ mkDerivation, base, criterion, optparse-applicative, process
+     , silently, text, turtle
+     }:
+     mkDerivation {
+       pname = "bench";
+       version = "1.0.10";
+       sha256 = "0h5lqxzx170a742rjqlngikar58krzyr772hd8f92zg85p1qgqzx";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base criterion optparse-applicative process silently text turtle
+       ];
+       description = "Command-line benchmark tool";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bench-graph" = callPackage
     ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, csv
      , directory, filepath, split, text, transformers, Unique
@@ -39593,8 +39604,8 @@ self: {
      }:
      mkDerivation {
        pname = "bugsnag-haskell";
-       version = "0.0.1.1";
-       sha256 = "09jv8qr795ag12xf035ywpvnd61q7cgsqcx1irvyh9zlmiixb975";
+       version = "0.0.1.2";
+       sha256 = "0xd0vxvvbp2fzy4z9yfrc6j5km1612ivnhrx71zzv17m5r2z50sv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -48137,6 +48148,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "coercible-utils" = callPackage
+    ({ mkDerivation, base, gauge }:
+     mkDerivation {
+       pname = "coercible-utils";
+       version = "0.0.0";
+       sha256 = "164cn0cs7fjfm599v2z8wsgsz599f97wky4h7vycf460rn34jqia";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base gauge ];
+       description = "Utility functions for Coercible types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cofunctor" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -49253,8 +49277,8 @@ self: {
      }:
      mkDerivation {
        pname = "compactable";
-       version = "0.1.2.1";
-       sha256 = "00fxrwyn1znyhfpql2ygh308b7nl6a3lgxvl39q3qm89wzh2gisc";
+       version = "0.1.2.2";
+       sha256 = "0jmc2b7mvqjwv54k7xnqydqf2qa7drr0l0f2vzd1a9pasbw5kx8x";
        libraryHaskellDepends = [
          base bifunctors containers transformers vector
        ];
@@ -50490,34 +50514,6 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.3.0.2";
-       sha256 = "0nqy9bffg2p2ij8isz99r7i5zm7sib0m9fqwisknakjh8b99kw60";
-       libraryHaskellDepends = [
-         base bytestring directory exceptions filepath mono-traversable mtl
-         primitive resourcet text transformers unix unliftio-core vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory exceptions filepath hspec
-         mono-traversable mtl QuickCheck resourcet safe silently split text
-         transformers unliftio vector
-       ];
-       benchmarkHaskellDepends = [
-         base containers deepseq gauge hspec kan-extensions mwc-random
-         transformers vector
-       ];
-       description = "Streaming data processing library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit_1_3_0_3" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , exceptions, filepath, gauge, hspec, kan-extensions
-     , mono-traversable, mtl, mwc-random, primitive, QuickCheck
-     , resourcet, safe, silently, split, text, transformers, unix
-     , unliftio, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "conduit";
        version = "1.3.0.3";
        sha256 = "1sangm0qqi9dzlq95746a3kl14k8b09592a423shxjf2a0b1yx5v";
        libraryHaskellDepends = [
@@ -50535,7 +50531,6 @@ self: {
        ];
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-algorithms" = callPackage
@@ -51884,6 +51879,16 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "contiguous-checked" = callPackage
+    ({ mkDerivation, base, contiguous, primitive }:
+     mkDerivation {
+       pname = "contiguous-checked";
+       version = "0.2.0.0";
+       sha256 = "0cb7cankkmn8nb7v6fy4ykcglfd4sd5nc916lg1nyj7fjr5v7y4l";
+       libraryHaskellDepends = [ base contiguous primitive ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "continue" = callPackage
     ({ mkDerivation, base, bifunctors, monad-control, mtl
      , semigroupoids, transformers, transformers-base
@@ -60740,6 +60745,8 @@ self: {
        pname = "detour-via-sci";
        version = "1.0.0";
        sha256 = "1r417lp98k0nizlxh7r74c2c4g1ij33pk5ip0bm7ssmzyya127j5";
+       revision = "1";
+       editedCabalFile = "00dj8vf9gg9ww37sir6mblf3xhcpam8qgfz5bfana23arhf2cixj";
        libraryHaskellDepends = [
          aeson base cassava newtype scientific siggy-chardust
          template-haskell
@@ -60760,6 +60767,8 @@ self: {
        pname = "detour-via-uom";
        version = "1.0.0";
        sha256 = "07jhj5mrfkfi2l05fyax6aylq4rp0nixvpsymv2xjzvbv2pfmdq7";
+       revision = "1";
+       editedCabalFile = "1l8az0mqcms0w59dr1bvklplmdqzr8yliwq522smcrn4krj3rl10";
        libraryHaskellDepends = [
          aeson base cassava detour-via-sci newtype scientific uom-plugin
        ];
@@ -60974,37 +60983,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall_1_14_0" = callPackage
+  "dhall_1_15_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive
-     , containers, contravariant, cryptonite, deepseq, directory
-     , doctest, exceptions, filepath, formatting, haskeline, http-client
+     , containers, contravariant, criterion, cryptonite, deepseq, Diff
+     , directory, doctest, exceptions, filepath, haskeline, http-client
      , http-client-tls, insert-ordered-containers, lens-family-core
      , megaparsec, memory, mtl, optparse-applicative, parsers
      , prettyprinter, prettyprinter-ansi-terminal, repline, scientific
-     , tasty, tasty-hunit, text, transformers, unordered-containers
-     , vector
+     , tasty, tasty-hunit, template-haskell, text, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.14.0";
-       sha256 = "0dm823rr4gkx1m7f0v9wvqlkhn1mmmml854p4zsi2j6ai4l885gl";
+       version = "1.15.0";
+       sha256 = "1p74jrrl5g5rfjp5kc2k3r1rq2cc80k166pg4ii1ams6j8ik1fys";
+       revision = "1";
+       editedCabalFile = "15z19v1g7wlgr99pb3sh7543v6bi4xb2v1nb1r8dm71ah63dki5r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring case-insensitive containers
-         contravariant cryptonite directory exceptions filepath formatting
-         http-client http-client-tls insert-ordered-containers
-         lens-family-core megaparsec memory parsers prettyprinter
-         prettyprinter-ansi-terminal scientific text transformers
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         ansi-terminal base haskeline megaparsec mtl optparse-applicative
-         prettyprinter prettyprinter-ansi-terminal repline text
+         contravariant cryptonite Diff directory exceptions filepath
+         haskeline http-client http-client-tls insert-ordered-containers
+         lens-family-core megaparsec memory mtl optparse-applicative parsers
+         prettyprinter prettyprinter-ansi-terminal repline scientific
+         template-haskell text transformers unordered-containers vector
        ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base deepseq doctest insert-ordered-containers prettyprinter tasty
-         tasty-hunit text vector
+         base deepseq Diff doctest insert-ordered-containers prettyprinter
+         tasty tasty-hunit text vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion directory text
        ];
        description = "A configuration language guaranteed to terminate";
        license = stdenv.lib.licenses.bsd3;
@@ -61012,19 +61023,19 @@ self: {
      }) {};
 
   "dhall-bash" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dhall, formatting
+    ({ mkDerivation, base, bytestring, containers, dhall
      , insert-ordered-containers, neat-interpolation, optparse-generic
      , shell-escape, text
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.13";
-       sha256 = "04f9ksw36kqb1g41211hcfcgg21pxkdszsznpa1vh09dcmlv6i7i";
+       version = "1.0.14";
+       sha256 = "1zxqlmnhq8lrwxiqz7hlqln7wf14mlz78s018yqy3hpzmy3aa84d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers dhall formatting
-         insert-ordered-containers neat-interpolation shell-escape text
+         base bytestring containers dhall insert-ordered-containers
+         neat-interpolation shell-escape text
        ];
        executableHaskellDepends = [
          base bytestring dhall optparse-generic text
@@ -61072,15 +61083,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-json_1_2_0" = callPackage
+  "dhall-json_1_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
      , insert-ordered-containers, optparse-applicative, text
      , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.2.0";
-       sha256 = "0ks8ycgysimj1jqabzdrrsdcqkp3bi5f0zhwgmilsprx88dxrddz";
+       version = "1.2.1";
+       sha256 = "0zf88py0hfrzsa3jq5i8nz0wv8m1b753bdakvykmkj6r0dgd574r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61116,19 +61127,19 @@ self: {
      }) {};
 
   "dhall-nix" = callPackage
-    ({ mkDerivation, base, containers, data-fix, dhall, formatting
-     , hnix, insert-ordered-containers, neat-interpolation
-     , optparse-generic, scientific, text
+    ({ mkDerivation, base, containers, data-fix, dhall, hnix
+     , insert-ordered-containers, neat-interpolation, optparse-generic
+     , text
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.1.4";
-       sha256 = "1yhnpmvisizl5vm37sns8sn0ff496aqr2i76v3c2034cjd9v0mdb";
+       version = "1.1.5";
+       sha256 = "1j0b7w8ydhz5fq7jmajz35j8bw2xmr1v0pbl4yfkc2gv8djmiw6y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers data-fix dhall formatting hnix
-         insert-ordered-containers neat-interpolation scientific text
+         base containers data-fix dhall hnix insert-ordered-containers
+         neat-interpolation text
        ];
        executableHaskellDepends = [
          base dhall hnix optparse-generic text
@@ -61139,14 +61150,16 @@ self: {
      }) {};
 
   "dhall-text" = callPackage
-    ({ mkDerivation, base, dhall, optparse-generic, text }:
+    ({ mkDerivation, base, dhall, optparse-applicative, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.10";
-       sha256 = "07cxc3m2pqg5lk0d03i20ch6bsq779sg3ci4yy1fkai8vs513yjq";
+       version = "1.0.11";
+       sha256 = "0zbsr5mchcm3713y6dbdj1vlak5rb6f13p6a8ah7f3kcihdpx0b1";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [ base dhall optparse-generic text ];
+       executableHaskellDepends = [
+         base dhall optparse-applicative text
+       ];
        description = "Template text using Dhall";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64317,6 +64330,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "docker_0_6_0_0" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
+     , conduit-combinators, conduit-extra, connection, containers
+     , data-default-class, directory, exceptions, filemanip, filepath
+     , http-client, http-client-tls, http-conduit, http-types, lens
+     , lens-aeson, monad-control, mtl, network, process, QuickCheck
+     , resourcet, scientific, tar, tasty, tasty-hunit, tasty-quickcheck
+     , temporary, text, time, tls, transformers, transformers-base
+     , unliftio-core, unordered-containers, uuid, vector, x509
+     , x509-store, x509-system, zlib
+     }:
+     mkDerivation {
+       pname = "docker";
+       version = "0.6.0.0";
+       sha256 = "0i90nkj1fc4swr6nral2y6raa6mmdz8x40sg47ww42dw18q00fjd";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring conduit conduit-combinators
+         conduit-extra containers data-default-class directory exceptions
+         filemanip filepath http-client http-conduit http-types
+         monad-control mtl network resourcet scientific tar temporary text
+         time tls transformers transformers-base unliftio-core
+         unordered-containers uuid vector x509 x509-store x509-system zlib
+       ];
+       testHaskellDepends = [
+         aeson base bytestring connection containers directory http-client
+         http-client-tls http-types lens lens-aeson process QuickCheck tasty
+         tasty-hunit tasty-quickcheck text transformers unordered-containers
+         vector
+       ];
+       description = "An API client for docker written in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "docker-build-cacher" = callPackage
     ({ mkDerivation, base, containers, foldl, language-docker
      , system-filepath, text, turtle
@@ -64593,6 +64640,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "doctest-driver-gen_0_2_0_3" = callPackage
+    ({ mkDerivation, base, doctest }:
+     mkDerivation {
+       pname = "doctest-driver-gen";
+       version = "0.2.0.3";
+       sha256 = "1vm9rwym2fdl76kwgkh21z2ixfcvza1df4gba2hm7hkk0n4ndcq6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base doctest ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
+       description = "Generate driver file for doctest's cabal integration";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-prop" = callPackage
     ({ mkDerivation, base, doctest, HUnit, QuickCheck }:
      mkDerivation {
@@ -71665,15 +71728,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "extensible-effects_2_6_3_0" = callPackage
+  "extensible-effects_3_0_0_0" = callPackage
     ({ mkDerivation, base, criterion, doctest, HUnit, monad-control
      , mtl, QuickCheck, silently, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-th, transformers-base
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "2.6.3.0";
-       sha256 = "07syxmhyqhcbsbwwc701k5rya89pkhcjly9nrdw7mspxailbggzs";
+       version = "3.0.0.0";
+       sha256 = "1sqvdwqi3aqqhsjny7h1i7gany4b79nqc539b5arwksjvsgmv2yb";
        libraryHaskellDepends = [ base monad-control transformers-base ];
        testHaskellDepends = [
          base doctest HUnit monad-control QuickCheck silently test-framework
@@ -71696,15 +71759,16 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects-concurrent";
-       version = "0.2.0.3";
-       sha256 = "024wn3i2nxi9j4gskhjnrkqifwszfpfnn812p34krvf763vfqcn1";
+       version = "0.3.0.2";
+       sha256 = "1w44dyyi3qgqsmbvnid67cn8mqy85si75wpryhl76b456pgp0ynl";
        libraryHaskellDepends = [
          base containers directory extensible-effects filepath lens
          logging-effect monad-control mtl parallel process QuickCheck random
          stm tagged time transformers
        ];
        testHaskellDepends = [
-         base extensible-effects HUnit stm tasty tasty-discover tasty-hunit
+         base containers extensible-effects HUnit lens QuickCheck stm tasty
+         tasty-discover tasty-hunit
        ];
        description = "Message passing concurrency as extensible-effect";
        license = stdenv.lib.licenses.bsd3;
@@ -73410,6 +73474,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "festung" = callPackage
+    ({ mkDerivation, aeson, argparser, async, base, base64-bytestring
+     , bytestring, case-insensitive, containers, directory, either
+     , exceptions, filepath, hspec, http-types, HUnit, mtl, scientific
+     , sqlcipher, temporary, text, transformers, unordered-containers
+     , utf8-string, vector, wai, wai-extra, yesod, yesod-core
+     , yesod-test
+     }:
+     mkDerivation {
+       pname = "festung";
+       version = "0.9.1.2";
+       sha256 = "09vcwds5vvk7a899nb4xvpfwkdgmm21w1lv4lacsdl7rvrw84f4l";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson argparser async base base64-bytestring bytestring
+         case-insensitive containers directory either exceptions filepath
+         http-types mtl scientific sqlcipher text transformers
+         unordered-containers utf8-string vector wai yesod yesod-core
+       ];
+       executableHaskellDepends = [ argparser base yesod ];
+       testHaskellDepends = [
+         aeson base base64-bytestring bytestring containers directory
+         exceptions filepath hspec HUnit scientific temporary text wai-extra
+         yesod yesod-test
+       ];
+       description = "Remote multi-db SQLCipher server";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fez-conf" = callPackage
     ({ mkDerivation, base, containers, regex-compat }:
      mkDerivation {
@@ -75230,6 +75324,8 @@ self: {
        pname = "flight-igc";
        version = "0.1.0";
        sha256 = "1cr25xhwmpzi0rg8znj1q7siy5skjm8q08ncgwvmd4h3mmdbb7xl";
+       revision = "1";
+       editedCabalFile = "0yaqp249gjqgch7w9d8y963afvjl43mhaywgni3x8ld14h55m7ia";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec ];
@@ -75243,6 +75339,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "flight-kml" = callPackage
+    ({ mkDerivation, aeson, base, detour-via-sci, doctest, hlint, hxt
+     , hxt-xpath, parsec, path, raw-strings-qq, siggy-chardust
+     , smallcheck, split, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, template-haskell, time
+     }:
+     mkDerivation {
+       pname = "flight-kml";
+       version = "1.0.0";
+       sha256 = "0h04f0hkcri1qjk9kfc4r0sg8wyf6hx6s4cjgzaqnmfak6sa9j9c";
+       libraryHaskellDepends = [
+         aeson base detour-via-sci hxt hxt-xpath parsec path siggy-chardust
+         split time
+       ];
+       testHaskellDepends = [
+         aeson base detour-via-sci doctest hlint hxt hxt-xpath parsec path
+         raw-strings-qq siggy-chardust smallcheck split tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck template-haskell time
+       ];
+       description = "Parsing of pilot tracklogs dumped as KML";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "flip-cmd" = callPackage
     ({ mkDerivation, base, process, safe-exceptions }:
      mkDerivation {
@@ -75962,7 +76081,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "foldl_1_4_0" = callPackage
+  "foldl_1_4_1" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, criterion, hashable, mwc-random, primitive
      , profunctors, semigroups, text, transformers, unordered-containers
@@ -75970,8 +76089,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.4.0";
-       sha256 = "16vx35yl853g9ql9ncpa6r29bg5cai40s7jnpjj2d06ij9cad955";
+       version = "1.4.1";
+       sha256 = "0xfwqhn4nzl1fi1v1h7i9haxjy32118lf08rgfiqpw33zzrkyz6d";
        libraryHaskellDepends = [
          base bytestring comonad containers contravariant hashable
          mwc-random primitive profunctors semigroups text transformers
@@ -76711,8 +76830,8 @@ self: {
      }:
      mkDerivation {
        pname = "fortytwo";
-       version = "1.0.3";
-       sha256 = "113z46b5dnf6z7bxw1a4vhr84w5pw0iridsi3wjimhjz0rr530cm";
+       version = "1.0.4";
+       sha256 = "0gbvhlsyhfslxrwkdldn15adj8f371rhx5qxfapcpqfa6pwbjsfd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base text ];
@@ -77737,6 +77856,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fromhtml" = callPackage
+    ({ mkDerivation, base, bytestring, pandoc, process, text }:
+     mkDerivation {
+       pname = "fromhtml";
+       version = "0.1.0.0";
+       sha256 = "1qck5pbbs0jc0vfjsvyx3yc1q3zlrggy51dlrjlkarppwyndqrln";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring pandoc process text ];
+       executableHaskellDepends = [ base bytestring pandoc process text ];
+       testHaskellDepends = [ base bytestring pandoc process text ];
+       description = "Simple library for transformation of HTML to other formats";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "frontmatter" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec, QuickCheck
      , text, yaml
@@ -78343,6 +78477,21 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "funcons-lambda-cbv-mp" = callPackage
+    ({ mkDerivation, base, containers, funcons-tools, gll, text }:
+     mkDerivation {
+       pname = "funcons-lambda-cbv-mp";
+       version = "0.1.0.0";
+       sha256 = "0ndjzixmjj2z9l3f65p4zd5yjjw5nd4x8vzlyk51zj7zkbz6pc09";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers funcons-tools gll text
+       ];
+       description = "Basic call-by-value lambda-calculus with operational semantics based on Funcons";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "funcons-tools" = callPackage
     ({ mkDerivation, base, bv, containers, directory, funcons-values
      , gll, mtl, multiset, random-strings, regex-applicative, split
@@ -79738,8 +79887,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-accessors";
-       version = "0.6.2.0";
-       sha256 = "1id0zc617wskz5p8mbawqin03f73vvqy3d8jm6ywzyw3in5y82hs";
+       version = "0.7.0.0";
+       sha256 = "0jvrwjry0kgw27qhnqxm5zvpks69cvvj0iz1ipvdsd5hi16dxarb";
        libraryHaskellDepends = [
          base binary cereal lens linear spatial-math TypeCompose
        ];
@@ -79868,6 +80017,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generic-deriving_1_12_2" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover
+     , template-haskell, th-abstraction
+     }:
+     mkDerivation {
+       pname = "generic-deriving";
+       version = "1.12.2";
+       sha256 = "1i7d6cpj9yhaqb79zays3nqchhaacacjz9bkc0zlwj73y5gvi22n";
+       libraryHaskellDepends = [
+         base containers ghc-prim template-haskell th-abstraction
+       ];
+       testHaskellDepends = [ base hspec template-haskell ];
+       testToolDepends = [ hspec-discover ];
+       description = "Generic programming library for generalised deriving";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generic-enum" = callPackage
     ({ mkDerivation, array, base, bytestring, hspec }:
      mkDerivation {
@@ -85024,26 +85191,6 @@ self: {
      }:
      mkDerivation {
        pname = "glabrous";
-       version = "0.3.5";
-       sha256 = "0n3mqpcmxz9z339r18dac5s4zdgkknlx470cd1mfi9gd932cr4z9";
-       libraryHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
-         either text unordered-containers
-       ];
-       testHaskellDepends = [
-         base directory either hspec text unordered-containers
-       ];
-       description = "A template DSL library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "glabrous_0_3_6" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , cereal, cereal-text, directory, either, hspec, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "glabrous";
        version = "0.3.6";
        sha256 = "1ba1smngfq6xqwcbfg10sy2qjxh7miyd8qbfmmv14klzwimk44ri";
        libraryHaskellDepends = [
@@ -85055,7 +85202,6 @@ self: {
        ];
        description = "A template DSL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glade" = callPackage
@@ -88484,6 +88630,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "graph" = callPackage
+    ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck }:
+     mkDerivation {
+       pname = "graph";
+       version = "0.0.0.0";
+       sha256 = "1v94nii7q6smm37m3yk390mcxpa69qclxqqdzcmay8f096dzk3pd";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       description = "Class of graphs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "graph-core" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, HTF, mtl
      , QuickCheck, safe, unordered-containers, vector
@@ -96874,28 +97032,6 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-src-meta";
-       version = "0.8.0.2";
-       sha256 = "12rc4v5dbbbcwdp7j8isvnm9vqpazv124j5kdfwlgwgwjhxi8ysb";
-       revision = "1";
-       editedCabalFile = "07xxp2r8amd420bzl7xlyfydhyrcrvaxq24ydnx7y2sz4v2nlzsz";
-       libraryHaskellDepends = [
-         base haskell-src-exts pretty syb template-haskell th-orphans
-       ];
-       testHaskellDepends = [
-         base haskell-src-exts HUnit pretty template-haskell test-framework
-         test-framework-hunit
-       ];
-       description = "Parse source to template-haskell abstract syntax";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-src-meta_0_8_0_3" = callPackage
-    ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb
-     , template-haskell, test-framework, test-framework-hunit
-     , th-orphans
-     }:
-     mkDerivation {
-       pname = "haskell-src-meta";
        version = "0.8.0.3";
        sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4";
        libraryHaskellDepends = [
@@ -96907,7 +97043,6 @@ self: {
        ];
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-meta-mwotton" = callPackage
@@ -103523,14 +103658,14 @@ self: {
 
   "hindent" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, criterion
-     , deepseq, descriptive, Diff, directory, exceptions, filepath
-     , ghc-prim, haskell-src-exts, hspec, monad-loops, mtl, path
-     , path-io, text, transformers, unix-compat, utf8-string, yaml
+     , deepseq, Diff, directory, exceptions, filepath, ghc-prim
+     , haskell-src-exts, hspec, monad-loops, mtl, optparse-applicative
+     , path, path-io, text, transformers, unix-compat, utf8-string, yaml
      }:
      mkDerivation {
        pname = "hindent";
-       version = "5.2.5";
-       sha256 = "19lckzwsqy8d1wry7hlg5vcg10dc5isai1z0n8srap5hlqvifw1g";
+       version = "5.2.7";
+       sha256 = "06p7rn689ynlxxgpy7ix8r69zwz4iwp7rfvcjxa6kxayfiq3hc2w";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -103539,9 +103674,9 @@ self: {
          haskell-src-exts monad-loops mtl text transformers utf8-string yaml
        ];
        executableHaskellDepends = [
-         base bytestring deepseq descriptive directory exceptions ghc-prim
-         haskell-src-exts path path-io text transformers unix-compat
-         utf8-string yaml
+         base bytestring deepseq directory exceptions ghc-prim
+         haskell-src-exts optparse-applicative path path-io text
+         transformers unix-compat utf8-string yaml
        ];
        testHaskellDepends = [
          base bytestring deepseq Diff directory exceptions haskell-src-exts
@@ -110919,15 +111054,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec_2_5_1" = callPackage
+  "hspec_2_5_3" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.5.1";
-       sha256 = "1hip8937prrvkdp63jwicg80b9fpj1yb4rfwl68jd76x2j15hyyl";
+       version = "2.5.3";
+       sha256 = "1rpiaw5m18zdsap7m7ih01awgmnaanq6rshhx9krway1v1y635ab";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -111025,7 +111160,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_5_1" = callPackage
+  "hspec-core_2_5_3" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -111033,8 +111168,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.5.1";
-       sha256 = "0yfw5rxyh830sb4l0zmsvjyanlg4q20y9hd90d3np5qwhpz4b3p8";
+       version = "2.5.3";
+       sha256 = "0gm9ydc89xhv56v6zqpmphl6pr4cik98rny3jy4x5vdwixv1yyyi";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -111088,13 +111223,13 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-discover_2_5_1" = callPackage
+  "hspec-discover_2_5_3" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.5.1";
-       sha256 = "0a3j58jxfv9i15shifhmm7i6i0xd9p4pd3grm4my5c80nhsps61w";
+       version = "2.5.3";
+       sha256 = "0ja4360cphbhiaqfjsgm9qzzckvf0yc4f3c6wkr4iydx1km7v0r0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -113194,8 +113329,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client-extra";
-       version = "0.1.2.0";
-       sha256 = "087qwyg2ws3fz26ghys4vafdcbkfx6bxsz1pzni8102ynk3hwn5m";
+       version = "0.1.3.0";
+       sha256 = "112x03s2iqdbp6gpa7hmsnjl86s8cpmpb82n4fxiy9d3rbp72a0j";
        libraryHaskellDepends = [
          aeson array base base64-bytestring blaze-builder bytestring
          case-insensitive containers data-default exceptions http-client
@@ -115104,8 +115239,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-avro";
-       version = "2.0.0";
-       sha256 = "048pj3xq56kvkcgcczvavnhpq8a0hpvnna0w5m5k12wb4hvrj4h5";
+       version = "2.1.0";
+       sha256 = "06yz55g4hqv8lbx0ywkiwwww81dmk44zi37s7sq09vkvbk9hm9v2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119225,6 +119360,8 @@ self: {
        pname = "inline-r";
        version = "0.9.1";
        sha256 = "1wpvyagc56yjkxvaw7a64gl2i4qfn4cgb47nx53pc6wcph7cyras";
+       revision = "1";
+       editedCabalFile = "0gid75ls60mfl0017716mqkypsbsv92lm1lsx2mf8vvd30znhcv0";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default-class deepseq
          exceptions inline-c mtl pretty primitive process reflection setenv
@@ -119246,6 +119383,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) R;};
 
+  "inline-r_0_9_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , data-default-class, deepseq, directory, exceptions, filepath
+     , ieee754, inline-c, mtl, pretty, primitive, process
+     , quickcheck-assertions, R, reflection, setenv, silently
+     , singletons, strict, tasty, tasty-expected-failure, tasty-golden
+     , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text
+     , th-lift, th-orphans, transformers, unix, vector
+     }:
+     mkDerivation {
+       pname = "inline-r";
+       version = "0.9.2";
+       sha256 = "1h2gwrh8kzx3przx29gcl4wffni3bxy1yrfabf88bdxjwj79s7z0";
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default-class deepseq
+         exceptions inline-c mtl pretty primitive process reflection setenv
+         singletons template-haskell text th-lift th-orphans transformers
+         unix vector
+       ];
+       libraryPkgconfigDepends = [ R ];
+       testHaskellDepends = [
+         base bytestring directory filepath ieee754 mtl process
+         quickcheck-assertions silently singletons strict tasty
+         tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
+         template-haskell temporary text unix vector
+       ];
+       benchmarkHaskellDepends = [
+         base criterion filepath primitive process singletons
+         template-haskell vector
+       ];
+       description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) R;};
+
   "inliterate" = callPackage
     ({ mkDerivation, base, blaze-html, cheapskate, containers
      , haskell-src-exts, lucid, lucid-extras, plotlyhs, text, time
@@ -119777,8 +119949,8 @@ self: {
      }:
      mkDerivation {
        pname = "intero";
-       version = "0.1.31";
-       sha256 = "0d6pc7mza12889wbzxy7gb5fb86v3b5pm2cdvcvnh6gd6x4ii336";
+       version = "0.1.32";
+       sha256 = "0xk693yhq2hkilznjzsszamvg7pg1l0qyb2y17ffr2s966i4pfr0";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -129220,22 +129392,17 @@ self: {
      }) {};
 
   "learn-physics" = callPackage
-    ({ mkDerivation, base, gloss, gnuplot, hmatrix, linear, not-gloss
-     , spatial-math, vector-space
-     }:
+    ({ mkDerivation, base, gloss, gnuplot, hmatrix, vector-space }:
      mkDerivation {
        pname = "learn-physics";
-       version = "0.6.0.2";
-       sha256 = "1bncqp4k1gbhc2yqnkja9xcxlh03wfaix1hiyv5llbzz06s9ia8a";
+       version = "0.6.2";
+       sha256 = "0j69q7jyznjjizkyyn032dfc1g9r6fssxp4b183bapj1xp9n116j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base gloss gnuplot hmatrix linear not-gloss spatial-math
-         vector-space
-       ];
-       executableHaskellDepends = [
-         base gloss gnuplot not-gloss spatial-math
+         base gloss gnuplot hmatrix vector-space
        ];
+       executableHaskellDepends = [ base gloss gnuplot ];
        description = "Haskell code for learning physics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130951,6 +131118,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "life-sync" = callPackage
+    ({ mkDerivation, ansi-terminal, base-noprelude, bytestring
+     , containers, filepath, fmt, hedgehog, microlens-platform
+     , optparse-applicative, path, path-io, process, tasty
+     , tasty-discover, tasty-hedgehog, text, tomland, universum
+     }:
+     mkDerivation {
+       pname = "life-sync";
+       version = "1.0";
+       sha256 = "04w83c96zhjl52j5iyy3149gpj3m02jfyfvbvvgg34xxqm0vwzha";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base-noprelude bytestring containers fmt
+         microlens-platform path path-io process text tomland universum
+       ];
+       executableHaskellDepends = [
+         base-noprelude containers optparse-applicative path
+       ];
+       testHaskellDepends = [
+         base-noprelude containers filepath hedgehog path tasty
+         tasty-hedgehog
+       ];
+       testToolDepends = [ tasty-discover ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "lift-generics" = callPackage
     ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim
      , hspec, template-haskell
@@ -131906,17 +132100,6 @@ self: {
      }) {};
 
   "linux-namespaces" = callPackage
-    ({ mkDerivation, base, unix }:
-     mkDerivation {
-       pname = "linux-namespaces";
-       version = "0.1.2.0";
-       sha256 = "0yznnp9rdz15drm79pvbqbrbk2nczbkmlf00pb7rki7w1l9njp2q";
-       libraryHaskellDepends = [ base unix ];
-       description = "Create new or enter an existing linux namespaces";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "linux-namespaces_0_1_3_0" = callPackage
     ({ mkDerivation, base, bytestring, unix }:
      mkDerivation {
        pname = "linux-namespaces";
@@ -131925,7 +132108,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Work with linux namespaces: create new or enter existing ones";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linux-perf" = callPackage
@@ -138944,6 +139126,8 @@ self: {
        pname = "menoh";
        version = "0.1.1";
        sha256 = "0cbkhafibm65yn4222kfy8j6zkw6q6k3962hwjhbvp2n57avh789";
+       revision = "1";
+       editedCabalFile = "1mbn1aq24dvaa1amwypik69dmg1x8mm1dz1h4kadzvljc4ld870i";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -140657,15 +140841,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "miso_0_20_0_0" = callPackage
+  "miso_0_20_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
      , http-types, lucid, network-uri, servant, servant-lucid, text
      , transformers, vector
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.20.0.0";
-       sha256 = "0nr7j9065mrwmmqwjsgl9krh21mhxjddbwmkwja0b207aglc072j";
+       version = "0.20.1.0";
+       sha256 = "03z6p29g5h3dhfpkv7sl81l0vcyi2r8chzdynwsz72d4i81vdi7j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141906,6 +142090,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "monad-markov" = callPackage
+    ({ mkDerivation, base, base-compat, MonadRandom, mtl, random
+     , transformers
+     }:
+     mkDerivation {
+       pname = "monad-markov";
+       version = "0.1.0.0";
+       sha256 = "173qlab980aq5hzxs4xxkx1ykvm40q84zsn6a8rksfq7sh1gzc1l";
+       libraryHaskellDepends = [
+         base base-compat MonadRandom mtl random transformers
+       ];
+       description = "Markov process monad";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "monad-memo" = callPackage
     ({ mkDerivation, array, base, containers, criterion, mtl, primitive
      , QuickCheck, random, test-framework, test-framework-quickcheck2
@@ -146168,8 +146367,8 @@ self: {
     ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
        pname = "names-th";
-       version = "0.2.0.4";
-       sha256 = "03nj3qdqkdl4wgb9s4p1dmrcx19ffc03br0a3n8z85bih0p4vgsq";
+       version = "0.2.0.5";
+       sha256 = "093ffvzbkd2mihnwwa4mfxbixaf37w6wf47bzgz1smlvmqihn0bh";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Manipulate name strings for TH";
        license = stdenv.lib.licenses.bsd3;
@@ -149773,16 +149972,17 @@ self: {
 
   "normalize" = callPackage
     ({ mkDerivation, base, bytestring, cassava, containers, lens
-     , optparse-generic, statistics, text, vector
+     , optparse-generic, statistics, text, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "normalize";
-       version = "0.3.0.1";
-       sha256 = "1wx7jfbc5s1zpksyq1vhb3460gll1fl6lkdbp3349rxifz0l27dq";
+       version = "0.3.1.1";
+       sha256 = "03qlp2vixw7ihzd14vhxv4jrfpnv2yzz9nvqcfcmkkv5p20ldpxy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base cassava containers lens statistics text vector
+         vector-algorithms
        ];
        executableHaskellDepends = [
          base bytestring cassava containers optparse-generic text vector
@@ -150439,12 +150639,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask_0_2_3_0" = callPackage
+  "numhask_0_2_3_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "numhask";
-       version = "0.2.3.0";
-       sha256 = "1d4sc2gwra18zw9f063d28alf69nf0ikzsfxgc10z1zgy5bfyxny";
+       version = "0.2.3.1";
+       sha256 = "04f1gzfhaikwazvdz0aigf6lz8yk75p8ji9pjb0wsdyxs8mly21k";
        libraryHaskellDepends = [ base ];
        description = "numeric classes";
        license = stdenv.lib.licenses.bsd3;
@@ -157778,24 +157978,6 @@ self: {
      }:
      mkDerivation {
        pname = "persistable-record";
-       version = "0.6.0.3";
-       sha256 = "12arj395b1famyy0hxp394ci2y3mkly68i82a26p67g5dpmdm466";
-       libraryHaskellDepends = [
-         array base containers dlist names-th product-isomorphic
-         template-haskell th-data-compat transformers
-       ];
-       testHaskellDepends = [ base quickcheck-simple ];
-       description = "Binding between SQL database values and haskell records";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "persistable-record_0_6_0_4" = callPackage
-    ({ mkDerivation, array, base, containers, dlist, names-th
-     , product-isomorphic, quickcheck-simple, template-haskell
-     , th-data-compat, transformers
-     }:
-     mkDerivation {
-       pname = "persistable-record";
        version = "0.6.0.4";
        sha256 = "1ygqllybclw9mm0n05vh635wbz6qlsl2yhas3fxr3xhwsrrvwfkd";
        libraryHaskellDepends = [
@@ -157805,7 +157987,6 @@ self: {
        testHaskellDepends = [ base quickcheck-simple ];
        description = "Binding between SQL database values and haskell records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistable-types-HDBC-pg" = callPackage
@@ -157815,8 +157996,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistable-types-HDBC-pg";
-       version = "0.0.3.2";
-       sha256 = "0ddzmc19in35vxivgqp9yi8p2afvg67q2dwgl39pkw6camrqlh2r";
+       version = "0.0.3.3";
+       sha256 = "0m5cx6848s9vxmbrxwv3v9f3vplpayxjddn7j332k3kj3qbdgs4v";
        libraryHaskellDepends = [
          base bytestring convertible dlist HDBC persistable-record
          relational-query relational-query-HDBC text-postgresql
@@ -157828,15 +158009,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "persistable-types-HDBC-pg_0_0_3_4" = callPackage
+  "persistable-types-HDBC-pg_0_0_3_5" = callPackage
     ({ mkDerivation, base, bytestring, convertible, dlist, HDBC
      , persistable-record, relational-query, relational-query-HDBC
      , text-postgresql
      }:
      mkDerivation {
        pname = "persistable-types-HDBC-pg";
-       version = "0.0.3.4";
-       sha256 = "0iygm59rai7w9g43h2ypra1z4dq2rsw5vc3nwh5bzpaa6x2mqqfb";
+       version = "0.0.3.5";
+       sha256 = "0bzc7kv12mz7kan1ivqpf2k1kwn3f1h74gallfvfrqans3np6p4m";
        libraryHaskellDepends = [
          base bytestring convertible dlist HDBC persistable-record
          relational-query relational-query-HDBC text-postgresql
@@ -160092,6 +160273,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pipes-group_1_0_11" = callPackage
+    ({ mkDerivation, base, doctest, free, lens-family-core, pipes
+     , pipes-parse, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-group";
+       version = "1.0.11";
+       sha256 = "1570chhj3i587wgsgz70d1p94j524wz86xaal7imwvgmw40gdacc";
+       libraryHaskellDepends = [
+         base free pipes pipes-parse transformers
+       ];
+       testHaskellDepends = [ base doctest lens-family-core ];
+       description = "Group streams into substreams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-http" = callPackage
     ({ mkDerivation, base, bytestring, http-client, http-client-tls
      , pipes
@@ -164770,8 +164968,8 @@ self: {
     ({ mkDerivation, base, primitive }:
      mkDerivation {
        pname = "primitive-checked";
-       version = "0.6.3.0";
-       sha256 = "02097f658qidmcfaisrcl4k3vmipx8w8p6mcbnajc8ndb3m58bbl";
+       version = "0.6.4.0";
+       sha256 = "0605d585nr83dcbfld446aifh7mznl20lnlq5m7v650fr1vrklnf";
        libraryHaskellDepends = [ base primitive ];
        description = "primitive functions with bounds-checking";
        license = stdenv.lib.licenses.bsd3;
@@ -167600,30 +167798,6 @@ self: {
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "1.5.1.4";
-       sha256 = "1h6dl0h9ybbnjqs834bd1n5w4cx0vdbmi52mqdk2y9y267qc9k4a";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite hashable
-         http-client http-types memory text time transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite hspec
-         http-client http-types QuickCheck scientific text time transformers
-         unordered-containers vector
-       ];
-       description = "Haskell client library for the Pusher HTTP API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pusher-http-haskell_1_5_1_5" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , cryptonite, hashable, hspec, http-client, http-types, memory
-     , QuickCheck, scientific, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "pusher-http-haskell";
        version = "1.5.1.5";
        sha256 = "0bidqvyx5ss3zgw2ypbwnii1vqfqp0kwyf31h53pvza7c3xrpq4x";
        libraryHaskellDepends = [
@@ -167638,7 +167812,6 @@ self: {
        ];
        description = "Haskell client library for the Pusher HTTP API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pusher-ws" = callPackage
@@ -168350,10 +168523,8 @@ self: {
      }:
      mkDerivation {
        pname = "quantification";
-       version = "0.3";
-       sha256 = "0hljd4m55254kmcrp3iar8ya7ky5a73vk3vrmgandmb15fsp2wvy";
-       revision = "1";
-       editedCabalFile = "1kcx4z6xwpbzkydl1kknf5kr1p2ry163jrw5k58f5jpv5gkn7mgn";
+       version = "0.4";
+       sha256 = "0bsdfmzaaxq2mf6bbbphg2dy8q6lhc7n3mfcy20fp4la0cj49aj2";
        libraryHaskellDepends = [
          aeson base containers ghc-prim hashable path-pieces text
          unordered-containers vector
@@ -170393,6 +170564,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rank2classes_1_1" = callPackage
+    ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "rank2classes";
+       version = "1.1";
+       sha256 = "0m7zxgjql399xm97v9jczg13mclnwnwbls8d788iyfqbhlk3slkf";
+       libraryHaskellDepends = [
+         base distributive template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base distributive doctest tasty tasty-hunit
+       ];
+       description = "standard type constructor class hierarchy, only with methods of rank 2 types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rapid" = callPackage
     ({ mkDerivation, async, base, containers, foreign-store, stm }:
      mkDerivation {
@@ -173173,23 +173363,6 @@ self: {
      }:
      mkDerivation {
        pname = "regex-tdfa";
-       version = "1.2.3";
-       sha256 = "1n80ssz9k73s444b4hda6fhp1vyzg0fc5fvz0309fi9dh6xpxcc9";
-       revision = "1";
-       editedCabalFile = "05ygcwwi8zjd40r05kavbmlx6nw6gyb2yicaarwd45sxs1zk73rz";
-       libraryHaskellDepends = [
-         array base bytestring containers ghc-prim mtl parsec regex-base
-       ];
-       description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "regex-tdfa_1_2_3_1" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl
-     , parsec, regex-base
-     }:
-     mkDerivation {
-       pname = "regex-tdfa";
        version = "1.2.3.1";
        sha256 = "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala";
        libraryHaskellDepends = [
@@ -173197,7 +173370,6 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-tdfa-pipes" = callPackage
@@ -173753,8 +173925,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.11.1.0";
-       sha256 = "1iydq7jdsizacvanvxdfad52vjaazb2awv2h3lyiqrsmva1y0qmq";
+       version = "0.11.4.0";
+       sha256 = "0pai1x1hqk8mn7gqxjrchb7rcv5dc8q4iwiklb8w3band7jwpnf7";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          product-isomorphic sql-words template-haskell text th-reify-compat
@@ -173799,8 +173971,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.6.7.1";
-       sha256 = "011zvhwkdl7py1mdb5n65zc98xdfm013lpqc2kd37v9pvn11g28s";
+       version = "0.6.8.0";
+       sha256 = "1piriqd6rngbdlf9bx9zabbmpn255iqs29z6f8pkxr5qn3q33dzz";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record product-isomorphic relational-query
@@ -173814,7 +173986,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query-HDBC_0_6_8_0" = callPackage
+  "relational-query-HDBC_0_7_0_0" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, product-isomorphic
      , QuickCheck, quickcheck-simple, relational-query
@@ -173823,8 +173995,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.6.8.0";
-       sha256 = "1piriqd6rngbdlf9bx9zabbmpn255iqs29z6f8pkxr5qn3q33dzz";
+       version = "0.7.0.0";
+       sha256 = "1kzryjkfkg4f616ijyx28p72v9a45gpvjs7jpksb1by24ll9ly46";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record product-isomorphic relational-query
@@ -173846,23 +174018,6 @@ self: {
      }:
      mkDerivation {
        pname = "relational-record";
-       version = "0.2.1.2";
-       sha256 = "068d6a9xp9byhc3k1rb9a1zwifyg7mhxv3r6xisgdjv4w6fizbay";
-       libraryHaskellDepends = [
-         base persistable-record persistable-types-HDBC-pg
-         product-isomorphic relational-query relational-query-HDBC
-       ];
-       description = "Meta package of Relational Record";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-record_0_2_2_0" = callPackage
-    ({ mkDerivation, base, persistable-record
-     , persistable-types-HDBC-pg, product-isomorphic, relational-query
-     , relational-query-HDBC
-     }:
-     mkDerivation {
-       pname = "relational-record";
        version = "0.2.2.0";
        sha256 = "1nmkjq5jrs38d0mmdpy8ygkjncg3j5yjbkcv7mxrm8wlqdijdg8b";
        libraryHaskellDepends = [
@@ -173871,7 +174026,6 @@ self: {
        ];
        description = "Meta package of Relational Record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-record-examples" = callPackage
@@ -173900,21 +174054,6 @@ self: {
      }:
      mkDerivation {
        pname = "relational-schemas";
-       version = "0.1.6.1";
-       sha256 = "1lkqaahfrdm2dlyqz3wn9dm0sw8cypmndasrigc67q94ha4lrv81";
-       libraryHaskellDepends = [
-         base bytestring containers relational-query template-haskell time
-       ];
-       description = "RDBMSs' schema templates for relational-query";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-schemas_0_1_6_2" = callPackage
-    ({ mkDerivation, base, bytestring, containers, relational-query
-     , template-haskell, time
-     }:
-     mkDerivation {
-       pname = "relational-schemas";
        version = "0.1.6.2";
        sha256 = "1c578lz7k06clwn92wi3xl20imn8ddivqblxn0vqrnn5hfkfy8jm";
        libraryHaskellDepends = [
@@ -173922,7 +174061,6 @@ self: {
        ];
        description = "RDBMSs' schema templates for relational-query";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relative-date" = callPackage
@@ -176002,38 +176140,6 @@ self: {
      }:
      mkDerivation {
        pname = "riak";
-       version = "1.1.2.4";
-       sha256 = "1j67p29jnw6zy3294qwsc947akdk8xawa426fvnflbba5lmzxial";
-       libraryHaskellDepends = [
-         aeson async attoparsec base bifunctors binary blaze-builder
-         bytestring containers data-default-class deepseq
-         enclosed-exceptions exceptions hashable mersenne-random-pure64
-         monad-control network protocol-buffers pureMD5 random resource-pool
-         riak-protobuf semigroups stm text time transformers
-         transformers-base unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers data-default-class HUnit mtl
-         process QuickCheck riak-protobuf semigroups tasty tasty-hunit
-         tasty-quickcheck template-haskell text yaml
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion semigroups ];
-       description = "A Haskell client for the Riak decentralized data store";
-       license = "unknown";
-     }) {};
-
-  "riak_1_1_2_5" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary
-     , blaze-builder, bytestring, containers, criterion
-     , data-default-class, deepseq, enclosed-exceptions, exceptions
-     , hashable, HUnit, mersenne-random-pure64, monad-control, mtl
-     , network, process, protocol-buffers, pureMD5, QuickCheck, random
-     , resource-pool, riak-protobuf, semigroups, stm, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, time, transformers
-     , transformers-base, unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "riak";
        version = "1.1.2.5";
        sha256 = "1ln7qm6rl8nr4fc1109pk0jmnqhw4dm3q2jfmvd4a34whplzwln7";
        libraryHaskellDepends = [
@@ -176052,7 +176158,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion semigroups ];
        description = "A Haskell client for the Riak decentralized data store";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "riak-protobuf" = callPackage
@@ -176219,30 +176324,6 @@ self: {
      }:
      mkDerivation {
        pname = "rio";
-       version = "0.1.2.0";
-       sha256 = "0449jjgw38dwf0lw3vq0ri3gh7mlzfjkajz8xdvxr76ffs9kncwq";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq directory exceptions filepath
-         hashable microlens mtl primitive process text time typed-process
-         unix unliftio unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq directory exceptions filepath
-         hashable hspec microlens mtl primitive process text time
-         typed-process unix unliftio unordered-containers vector
-       ];
-       description = "A standard library for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rio_0_1_3_0" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
-     , process, text, time, typed-process, unix, unliftio
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "rio";
        version = "0.1.3.0";
        sha256 = "1bb20lc2kjk3ly54zkp00p80rysrvcqgkhl4lprgcq70svf5xk3i";
        libraryHaskellDepends = [
@@ -176257,7 +176338,6 @@ self: {
        ];
        description = "A standard library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rio-orphans" = callPackage
@@ -177586,8 +177666,8 @@ self: {
      }:
      mkDerivation {
        pname = "rss2irc";
-       version = "1.1";
-       sha256 = "1phclqhf1kvnix729d8117kq851b2f2snsvghr6h6112rg22cf2q";
+       version = "1.2";
+       sha256 = "00q684w6s9ixwrci6sfpzzw2hrsl7j29g07d9j5a5j9csz0cr8gg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -180417,6 +180497,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) SDL2;};
 
+  "sdl2_2_4_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, exceptions, linear
+     , SDL2, StateVar, text, transformers, vector, weigh
+     }:
+     mkDerivation {
+       pname = "sdl2";
+       version = "2.4.1.0";
+       sha256 = "0p4b12fmxps0sbnkqdfy0qw19s355yrkw7fgw6xz53wzq706k991";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring exceptions linear StateVar text transformers vector
+       ];
+       librarySystemDepends = [ SDL2 ];
+       libraryPkgconfigDepends = [ SDL2 ];
+       testHaskellDepends = [ base deepseq linear vector weigh ];
+       description = "Both high- and low-level bindings to the SDL library (version 2.0.4+).";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) SDL2;};
+
   "sdl2-cairo" = callPackage
     ({ mkDerivation, base, cairo, linear, sdl2 }:
      mkDerivation {
@@ -182927,22 +183029,6 @@ self: {
      }:
      mkDerivation {
        pname = "servant-generic";
-       version = "0.1.0.1";
-       sha256 = "1zgw5j3wx4fyb9nhifslzsbfla3iagkvix86vb1x3d9fyz117wif";
-       libraryHaskellDepends = [ base servant servant-server ];
-       testHaskellDepends = [
-         base network-uri servant servant-server text warp
-       ];
-       description = "Specify Servant APIs with records";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "servant-generic_0_1_0_2" = callPackage
-    ({ mkDerivation, base, network-uri, servant, servant-server, text
-     , warp
-     }:
-     mkDerivation {
-       pname = "servant-generic";
        version = "0.1.0.2";
        sha256 = "0pv0hgw85gmamvv8cd1yz03b56yfja8r1xrkvlzgb5lpw1ghxn0s";
        libraryHaskellDepends = [ base servant servant-server ];
@@ -182951,7 +183037,6 @@ self: {
        ];
        description = "Specify Servant APIs with records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-github" = callPackage
@@ -186376,6 +186461,8 @@ self: {
        pname = "siggy-chardust";
        version = "1.0.0";
        sha256 = "0hssby6mak0bq1fqv47hp6rnw51yz1kgzgsmnvh2k9jfq0y0qwwz";
+       revision = "1";
+       editedCabalFile = "1lknm1jr6h5qpixc727aj3zbmj4ia21r9lb8gzj50iildgmfk33b";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base doctest hlint smallcheck tasty tasty-hunit tasty-quickcheck
@@ -187104,8 +187191,8 @@ self: {
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "simple-smt";
-       version = "0.8";
-       sha256 = "0w4adm7zjiqbzm0vg8ky4xyldid00grsnjf7n4pkw5a2fw81qi3d";
+       version = "0.9.1";
+       sha256 = "13dg61jdgby49lpdb53anrg39wn8dwgvg6jpn8vh0y8rf2zilq9b";
        libraryHaskellDepends = [ base process ];
        description = "A simple way to interact with an SMT solver process";
        license = stdenv.lib.licenses.bsd3;
@@ -188280,6 +188367,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "slack-web_0_2_0_6" = callPackage
+    ({ mkDerivation, aeson, base, containers, errors, hspec
+     , http-api-data, http-client, http-client-tls, megaparsec, mtl
+     , servant, servant-client, servant-client-core, text, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "slack-web";
+       version = "0.2.0.6";
+       sha256 = "1rydw71na7qninys7nqyn36mld5a5csvlsf01yzansnn2gvpdh2a";
+       libraryHaskellDepends = [
+         aeson base containers errors http-api-data http-client
+         http-client-tls megaparsec mtl servant servant-client
+         servant-client-core text time transformers
+       ];
+       testHaskellDepends = [
+         aeson base containers errors hspec http-api-data megaparsec text
+         time
+       ];
+       description = "Bindings for the Slack web API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "slate" = callPackage
     ({ mkDerivation, base, directory, filepath, htoml
      , optparse-applicative, process, string-conversions
@@ -192534,25 +192645,12 @@ self: {
     ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
      mkDerivation {
        pname = "sql-words";
-       version = "0.1.6.1";
-       sha256 = "07prq4bcvl469m0sr767kxidr0kk27yynb9zsm48sjz84h0bx2v3";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base QuickCheck quickcheck-simple ];
-       description = "SQL keywords data constructors into OverloadedString";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sql-words_0_1_6_2" = callPackage
-    ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
-     mkDerivation {
-       pname = "sql-words";
        version = "0.1.6.2";
        sha256 = "0f7bvmz2ppq6pwgi3klxzpilnj899ssrsf52r99g9apqz065lsiz";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        description = "SQL keywords data constructors into OverloadedString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sqlcipher" = callPackage
@@ -195781,15 +195879,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "streaming-commons_0_2_0_0" = callPackage
+  "streaming-commons_0_2_1_0" = callPackage
     ({ mkDerivation, array, async, base, bytestring, deepseq, directory
      , gauge, hspec, network, process, QuickCheck, random, stm, text
      , transformers, unix, zlib
      }:
      mkDerivation {
        pname = "streaming-commons";
-       version = "0.2.0.0";
-       sha256 = "0pyfibrz30azq22zq7zl4wvbl0mm9wrqw1047p437h950d3biqpl";
+       version = "0.2.1.0";
+       sha256 = "13fn6qmpiggwpn8lczyydgp77cyzfypwds7wxskrwir4i5cgxlfq";
        libraryHaskellDepends = [
          array async base bytestring directory network process random stm
          text transformers unix zlib
@@ -197415,8 +197513,8 @@ self: {
      }:
      mkDerivation {
        pname = "summoner";
-       version = "1.0.3";
-       sha256 = "0hyki46wp34rzwdgbn6icr0pmsqg89kwqs7hs76ydi4jzxv5183j";
+       version = "1.0.4";
+       sha256 = "1gwglx6lvg962q7a5m0vx372vqyiw3sf5kxsbwnl53pgrynmjhyn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -200432,32 +200530,6 @@ self: {
 
   "tar-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
-     , containers, criterion, deepseq, directory, filepath, hspec
-     , QuickCheck, safe-exceptions, text, unix, weigh
-     }:
-     mkDerivation {
-       pname = "tar-conduit";
-       version = "0.2.3";
-       sha256 = "1is2q5662zrrxgb2dm2n1qa1aqdrwf4g7il5jdpxhri28m7pp7jp";
-       libraryHaskellDepends = [
-         base bytestring conduit conduit-combinators directory filepath
-         safe-exceptions text unix
-       ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-combinators containers deepseq
-         directory filepath hspec QuickCheck weigh
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring conduit conduit-combinators containers criterion
-         deepseq directory filepath hspec
-       ];
-       description = "Extract and create tar files using conduit for streaming";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "tar-conduit_0_2_3_1" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , conduit-extra, containers, criterion, deepseq, directory
      , filepath, hspec, QuickCheck, safe-exceptions, text, unix, weigh
      }:
@@ -200788,26 +200860,6 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-golden";
-       version = "2.3.1.3";
-       sha256 = "1xri8bnj22gzxkxz4hi2vqx0aaz51ww3zz9ac0ig0lw653kbj61p";
-       libraryHaskellDepends = [
-         async base bytestring containers deepseq directory filepath mtl
-         optparse-applicative process tagged tasty temporary
-       ];
-       testHaskellDepends = [
-         base directory filepath process tasty tasty-hunit temporary-rc
-       ];
-       description = "Golden tests support for tasty";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-golden_2_3_2" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, deepseq
-     , directory, filepath, mtl, optparse-applicative, process, tagged
-     , tasty, tasty-hunit, temporary, temporary-rc
-     }:
-     mkDerivation {
-       pname = "tasty-golden";
        version = "2.3.2";
        sha256 = "0k3ibjhjc9vcwzrjnl4rnwvfm8l81q347nb7dgvcib6n5wm3s404";
        libraryHaskellDepends = [
@@ -200819,7 +200871,6 @@ self: {
        ];
        description = "Golden tests support for tasty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-groundhog-converters" = callPackage
@@ -200878,6 +200929,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tasty-hedgehog-coverage" = callPackage
+    ({ mkDerivation, base, containers, hedgehog, mtl, tagged, tasty
+     , tasty-expected-failure, tasty-hedgehog, text, transformers
+     , wl-pprint-annotated
+     }:
+     mkDerivation {
+       pname = "tasty-hedgehog-coverage";
+       version = "0.1.0.0";
+       sha256 = "1d2hnhkpk71k0xjw63jsn6fa4ih01xqn4dgdbflp6yrs0zw6p95c";
+       libraryHaskellDepends = [
+         base containers hedgehog mtl tagged tasty tasty-hedgehog text
+         transformers wl-pprint-annotated
+       ];
+       testHaskellDepends = [
+         base hedgehog tasty tasty-expected-failure
+       ];
+       description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tasty-hspec" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
      , tasty-quickcheck, tasty-smallcheck
@@ -200896,6 +200967,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-hspec_1_1_5" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
+     , tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-hspec";
+       version = "1.1.5";
+       sha256 = "0m0ip2l4rg4pnrvk3mjxkbq2l683psv1x3v9l4rglk2k3pvxq36v";
+       revision = "1";
+       editedCabalFile = "0zgbcrahzfg37bnni6fj0qb0fpbk5rdha589mh960d5sbq58pljf";
+       libraryHaskellDepends = [
+         base hspec hspec-core QuickCheck tasty tasty-quickcheck
+         tasty-smallcheck
+       ];
+       description = "Hspec support for the Tasty test framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-html" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers, filepath
      , generic-deriving, mtl, stm, tagged, tasty, text, transformers
@@ -200913,6 +201003,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-html_0_4_1_2" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, containers, filepath
+     , generic-deriving, mtl, semigroups, stm, tagged, tasty, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "tasty-html";
+       version = "0.4.1.2";
+       sha256 = "1bffbp8qwyad85s9bl3ck3gxay3hphka527j09hn2sz1bfqzcihb";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base blaze-html bytestring containers filepath generic-deriving mtl
+         semigroups stm tagged tasty text transformers
+       ];
+       description = "Render tasty output to HTML";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-hunit" = callPackage
     ({ mkDerivation, base, call-stack, tasty }:
      mkDerivation {
@@ -203667,22 +203776,6 @@ self: {
      }:
      mkDerivation {
        pname = "text-postgresql";
-       version = "0.0.3.0";
-       sha256 = "0db08ri1zixxm8vhcnijv2wpmcyv3bali30a1fx4vmb8d6c1fh35";
-       libraryHaskellDepends = [
-         base dlist transformers transformers-compat
-       ];
-       testHaskellDepends = [ base QuickCheck quickcheck-simple ];
-       description = "Parser and Printer of PostgreSQL extended types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-postgresql_0_0_3_1" = callPackage
-    ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "text-postgresql";
        version = "0.0.3.1";
        sha256 = "1s42a1mq7hz63zfpcv7bl4141vnyrsyd0ir723iph6vmsa46iqn6";
        libraryHaskellDepends = [
@@ -203691,7 +203784,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        description = "Parser and Printer of PostgreSQL extended types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-printer" = callPackage
@@ -204269,10 +204361,10 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-abstraction";
-       version = "0.2.6.0";
-       sha256 = "0g42h6wnj2awc5ryhbvx009wd8w75pn66bjzsq1z4s3xajd2hbp5";
+       version = "0.2.7.0";
+       sha256 = "1233x853gcc18xm0d8ysf7rlkg9aphy2j6hn78yxchalglfwjixf";
        revision = "1";
-       editedCabalFile = "0k4s4nbg9jlgaza38842jnzs8s01ig85fzmjgd10k9hl02gc3r44";
+       editedCabalFile = "1fafzr80vbnamqq72rwnhk1ih3iyxzb8j2xfdgn691irv4fv6839";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -204281,14 +204373,12 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
-  "th-abstraction_0_2_7_0" = callPackage
+  "th-abstraction_0_2_8_0" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-abstraction";
-       version = "0.2.7.0";
-       sha256 = "1233x853gcc18xm0d8ysf7rlkg9aphy2j6hn78yxchalglfwjixf";
-       revision = "1";
-       editedCabalFile = "1fafzr80vbnamqq72rwnhk1ih3iyxzb8j2xfdgn691irv4fv6839";
+       version = "0.2.8.0";
+       sha256 = "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -204966,6 +205056,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "these-skinny" = callPackage
+    ({ mkDerivation, base, deepseq }:
+     mkDerivation {
+       pname = "these-skinny";
+       version = "0.7.4";
+       sha256 = "0hlxf94ir99y0yzm9pq8cvs7vbar4bpj1w1ibs96hrx2biwfbnkr";
+       libraryHaskellDepends = [ base deepseq ];
+       description = "A fork of the 'these' package without the dependency bloat";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "thespian" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -207279,14 +207380,14 @@ self: {
      }) {};
 
   "tomland" = callPackage
-    ({ mkDerivation, base, hashable, hedgehog, megaparsec, mtl
-     , parser-combinators, tasty, tasty-hedgehog, tasty-hspec, text
-     , time, unordered-containers
+    ({ mkDerivation, base, hashable, hedgehog, hspec-megaparsec
+     , megaparsec, mtl, parser-combinators, tasty, tasty-discover
+     , tasty-hedgehog, tasty-hspec, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "tomland";
-       version = "0.2.1";
-       sha256 = "09d0i1sys7nljbcky53qz4w2ibjyhcysa8ik0drb1pcyqyzppj8x";
+       version = "0.3";
+       sha256 = "0crwapvykd26b50bmh22vxpcv44f1jv88r0ifvr3hjmvv0v43lwh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -207295,9 +207396,10 @@ self: {
        ];
        executableHaskellDepends = [ base text time unordered-containers ];
        testHaskellDepends = [
-         base hedgehog tasty tasty-hedgehog tasty-hspec text
-         unordered-containers
+         base hedgehog hspec-megaparsec megaparsec tasty tasty-hedgehog
+         tasty-hspec text time unordered-containers
        ];
+       testToolDepends = [ tasty-discover ];
        description = "TOML parser";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -209588,31 +209690,10 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.5.8";
-       sha256 = "0vp442byylqki6pabhg8bs27msqsdcwcnql40z003jx1hidccnq4";
-       libraryHaskellDepends = [
-         ansi-wl-pprint async base bytestring clock containers directory
-         exceptions foldl hostname managed optional-args
-         optparse-applicative process semigroups stm system-fileio
-         system-filepath temporary text time transformers unix unix-compat
-       ];
-       testHaskellDepends = [ base doctest system-filepath temporary ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_5_9" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , containers, criterion, directory, doctest, exceptions, foldl
-     , hostname, managed, optional-args, optparse-applicative, process
-     , semigroups, stm, system-fileio, system-filepath, temporary, text
-     , time, transformers, unix, unix-compat
-     }:
-     mkDerivation {
-       pname = "turtle";
        version = "1.5.9";
        sha256 = "13x2qk8j2qxqqk60y17h7g1p76gj3xxyc4g78mb4d4ajq6smk91x";
+       revision = "1";
+       editedCabalFile = "19mbp8rz9mrc10k5s2n2ihsvk7i7sm19y3xvdy320aajxv7k69hh";
        libraryHaskellDepends = [
          ansi-wl-pprint async base bytestring clock containers directory
          exceptions foldl hostname managed optional-args
@@ -209623,7 +209704,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -211122,8 +211202,8 @@ self: {
      }:
      mkDerivation {
        pname = "typedquery";
-       version = "0.1.0.3";
-       sha256 = "0d90zzd1xk8llviknm21ck45gkaawyg7qj4mnf3f5csw66x2isbk";
+       version = "0.1.1.1";
+       sha256 = "1p6hlx2hsp7sjhspw3c95b1px6r2hylr31f4hcjq505z3i33gm7m";
        libraryHaskellDepends = [
          aeson base bytestring haskell-src-meta parsec template-haskell text
          transformers
@@ -211443,31 +211523,6 @@ self: {
      }:
      mkDerivation {
        pname = "ua-parser";
-       version = "0.7.4.1";
-       sha256 = "1pwls2qbhd3ig2lm4ix3kh08yw20k0iajigbxqd0vmpkx459pmrf";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring data-default file-embed pcre-light text yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring data-default file-embed filepath HUnit
-         pcre-light tasty tasty-hunit tasty-quickcheck text yaml
-       ];
-       benchmarkHaskellDepends = [
-         aeson base bytestring criterion data-default deepseq file-embed
-         filepath pcre-light text yaml
-       ];
-       description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ua-parser_0_7_5_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, criterion, data-default
-     , deepseq, file-embed, filepath, HUnit, pcre-light, tasty
-     , tasty-hunit, tasty-quickcheck, text, yaml
-     }:
-     mkDerivation {
-       pname = "ua-parser";
        version = "0.7.5.0";
        sha256 = "08nbzzhndxba039rl5s4ap5ndnfj774546xzvqf9ph8r05dmr690";
        enableSeparateDataOutput = true;
@@ -211484,7 +211539,6 @@ self: {
        ];
        description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uacpid" = callPackage
@@ -215230,17 +215284,13 @@ self: {
      }) {};
 
   "valor" = callPackage
-    ({ mkDerivation, base, checkers, hspec, hspec-checkers, QuickCheck
-     , text, transformers
-     }:
+    ({ mkDerivation, base, hspec, text, transformers }:
      mkDerivation {
        pname = "valor";
-       version = "0.0.0.1";
-       sha256 = "1cjkfalsrpw579bg12ldmzjmmkj9l7b35j2vp37qqgd39m1dm29a";
-       libraryHaskellDepends = [ base text transformers ];
-       testHaskellDepends = [
-         base checkers hspec hspec-checkers QuickCheck text transformers
-       ];
+       version = "0.1.0.0";
+       sha256 = "1rmsss4zffyzf6vf1p2zj07a6a32pyrbdb259gflr5gg817m3kh4";
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [ base hspec text transformers ];
        description = "Simple general structured validation library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220891,24 +220941,6 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind";
-       version = "0.1.2.0";
-       sha256 = "0c1nb713p11pd89ykwz76i60sk437q9cy48bingiiig1g9dfg3p6";
-       libraryHaskellDepends = [
-         base containers semigroups text transformers
-       ];
-       testHaskellDepends = [
-         base hspec microlens QuickCheck stm transformers
-       ];
-       description = "Dynamic key binding framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wild-bind_0_1_2_1" = callPackage
-    ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
-     , semigroups, stm, text, transformers
-     }:
-     mkDerivation {
-       pname = "wild-bind";
        version = "0.1.2.1";
        sha256 = "1jklfafgv9i2xzsrcz77wzf5p4sxz6cgk1nw3ydzsar5f3jyqxmf";
        libraryHaskellDepends = [
@@ -220919,7 +220951,6 @@ self: {
        ];
        description = "Dynamic key binding framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wild-bind-indicator" = callPackage
@@ -220961,25 +220992,6 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind-x11";
-       version = "0.2.0.3";
-       sha256 = "0naqmgkqqq83mnrp4ic97i6f6ak3h862jk6pa77c83qmz4ahh4ld";
-       libraryHaskellDepends = [
-         base containers fold-debounce mtl semigroups stm text transformers
-         wild-bind X11
-       ];
-       testHaskellDepends = [
-         async base hspec text time transformers wild-bind X11
-       ];
-       description = "X11-specific implementation for WildBind";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wild-bind-x11_0_2_0_4" = callPackage
-    ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
-     , semigroups, stm, text, time, transformers, wild-bind, X11
-     }:
-     mkDerivation {
-       pname = "wild-bind-x11";
        version = "0.2.0.4";
        sha256 = "0wfhva3xkjykf6nl4ghvmp7lx2g0isg09hhb4m44qg0cgv7rzh5z";
        libraryHaskellDepends = [
@@ -220991,7 +221003,6 @@ self: {
        ];
        description = "X11-specific implementation for WildBind";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wilton-ffi" = callPackage
@@ -225196,6 +225207,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml_0_8_31" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
+     , conduit, containers, directory, filepath, hspec, HUnit, libyaml
+     , mockery, resourcet, scientific, semigroups, template-haskell
+     , temporary, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.8.31";
+       sha256 = "1a9b24czyrls3d7lgamm0cmrwkndr8ip3h6d338q79alhdz8ziqm";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         filepath resourcet scientific semigroups template-haskell text
+         transformers unordered-containers vector
+       ];
+       libraryPkgconfigDepends = [ libyaml ];
+       testHaskellDepends = [
+         aeson base base-compat bytestring conduit directory hspec HUnit
+         mockery resourcet temporary text transformers unordered-containers
+         vector
+       ];
+       description = "Support for parsing and rendering YAML documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libyaml;};
+
   "yaml-combinators" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
      , scientific, tasty, tasty-hunit, text, transformers
@@ -225266,10 +225306,10 @@ self: {
     ({ mkDerivation, base, hspec, microlens-platform, rio, yaml }:
      mkDerivation {
        pname = "yaml-pretty-extras";
-       version = "0.0.2.1";
-       sha256 = "1xjkfrqip9dfsc964759h11jz8kpza20lcqbvwcw2li93fn5p8y7";
+       version = "0.0.2.2";
+       sha256 = "0pbpwrrbf4ibrid09ypqfz15d0b4kfgfs4ypfdn0bv5n25nn3ca2";
        libraryHaskellDepends = [ base microlens-platform rio yaml ];
-       testHaskellDepends = [ base hspec microlens-platform rio yaml ];
+       testHaskellDepends = [ base hspec microlens-platform rio ];
        description = "Extra functionality for pretty printing Yaml documents";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix
index 9cc0377f925f..410d07ebc61c 100644
--- a/pkgs/development/interpreters/python/cpython/3.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix
@@ -80,6 +80,7 @@ in stdenv.mkDerivation {
     "--without-ensurepip"
     "--with-system-expat"
     "--with-system-ffi"
+    "--with-openssl=${openssl.dev}"
   ];
 
   preConfigure = ''
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 8e51b9b7d58e..f333aa0b96d0 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   patches = [
     (fetchpatch {
       name = "gcc6.patch";
-      url = "https://anonscm.debian.org/cgit/collab-maint/mozjs.git/plain/debian/patches/fix-811665.patch?id=00b15c7841968ab4f7fec409a6b93fa5e1e1d32e";
+      url = "https://sources.debian.org/data/main/m/mozjs/1.8.5-1.0.0+dfsg-6/debian/patches/fix-811665.patch";
       sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99";
     })
   ] ++ stdenv.lib.optionals stdenv.isAarch32 [
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index a59641e99d39..ea70e6454536 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
+{stdenv, fetchFromGitHub, fetchpatch, mpir, gmp, mpfr, flint}:
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "arb";
@@ -17,6 +17,14 @@ stdenv.mkDerivation rec {
     "--with-flint=${flint}"
   ];
   doCheck = true;
+  patches = [
+    # https://github.com/fredrik-johansson/arb/pull/210, included in next release
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/fredrik-johansson/arb/pull/210.patch";
+      name = "return-exact-zero-where-possible.patch";
+      sha256 = "01j9npnpmwh4dla9i05qdn606hy34gy9bz7c9bbsqm7az3n7pxjg";
+    })
+  ];
   meta = {
     inherit version;
     description = ''A library for arbitrary-precision interval arithmetic'';
diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix
index 1df696c0ec64..7f1e3d941a1a 100644
--- a/pkgs/development/libraries/audio/rtaudio/default.nix
+++ b/pkgs/development/libraries/audio/rtaudio/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0jkqnhc2pq31nmq4daxhmqdjgv2qi4ib27hwms2r5zhnmvvzlr67";
   };
 
+  enableParallelBuilding = true;
+
   buildInputs = [ autoconf automake libtool libjack2 alsaLib rtmidi ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix
index 022c55045967..0f3f1fce42b0 100644
--- a/pkgs/development/libraries/audio/rtmidi/default.nix
+++ b/pkgs/development/libraries/audio/rtmidi/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "11pl45lp8sq5xkpipwk622w508nw0qcxr03ibicqn1lsws0hva96";
   };
 
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ autoconf automake libtool libjack2 alsaLib ];
 
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 00c6d279c7ac..34e837f7cd2b 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -9,8 +9,8 @@
 , enableMultiThreaded ? true
 , enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now
 , enableStatic ? !enableShared
-, enablePython ? hostPlatform == buildPlatform
-, enableNumpy ? enablePython && stdenv.lib.versionAtLeast version "1.65"
+, enablePython ? false
+, enableNumpy ? false
 , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
 , patches ? []
 , mpi ? null
diff --git a/pkgs/development/libraries/libgap/default.nix b/pkgs/development/libraries/libgap/default.nix
index dec9676d5729..42e812ec1f53 100644
--- a/pkgs/development/libraries/libgap/default.nix
+++ b/pkgs/development/libraries/libgap/default.nix
@@ -1,10 +1,17 @@
-{stdenv, fetchurl, gmp}:
+{ stdenv
+, fetchurl
+, gmp
+}:
+# will probably be obsolte (or at leat built from the upstream gap sources) soon (gap 4.9?). See
+# - https://github.com/gap-system/gap/projects/5#card-6239828
+# - https://github.com/markuspf/gap/issues/2
+# - https://trac.sagemath.org/ticket/22626
 stdenv.mkDerivation rec {
   name = "libgap-${version}";
+  # Has to be the same version as "gap"
   version = "4.8.6";
-  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
   src = fetchurl {
-    url = "http://mirrors.mit.edu/sage/spkg/upstream/libgap/libgap-${version}.tar.gz";
+    url = "mirror://sageupstream/libgap/libgap-${version}.tar.gz";
     sha256 = "1h5fx5a55857w583ql7ly2jl49qyx9mvs7j5abys00ra9gzrpn5v";
   };
   buildInputs = [gmp];
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 106de68d367a..7569f2613bbd 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -11,11 +11,11 @@ assert javaSupport -> jdk != null;
 
 stdenv.mkDerivation rec {
   name = "libguestfs-${version}";
-  version = "1.38.0";
+  version = "1.38.2";
 
   src = fetchurl {
     url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz";
-    sha256 = "0cgapiad3x5ggwm097mq62hng3bv91p5gmrikrb6adfaasr1l6m3";
+    sha256 = "16v2lpi9c0vnic2x0vpszmckh0x39bmf6x7y00vvzbwhszshxx3w";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix
index 78e7036bdccc..82caacf93e6a 100644
--- a/pkgs/development/libraries/libsidplayfp/default.nix
+++ b/pkgs/development/libraries/libsidplayfp/default.nix
@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
   pname = "libsidplayfp";
   major = "1";
   minor = "8";
-  level = "6";
+  level = "7";
   version = "${major}.${minor}.${level}";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${name}.tar.gz";
-    sha256 = "0lzivfdq0crmfr01c6f5h883yr7wvagq198xkk3srdmvshhxmwnw";
+    sha256 = "14k1sbdcbhykwfcadq5lbpnm9xp2r7vs7fyi84h72g89y8pjg0da";
   };
 
   nativeBuildInputs = [ pkgconfig ]
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index d0b2d79e9fab..1cc426138598 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -4,6 +4,9 @@
 let
   version = "1.1.7";
   formattedVersion = lib.replaceChars ["."] ["_"] version;
+
+  boostPython = boost.override { enablePython = true; };
+
 in stdenv.mkDerivation {
   name = "libtorrent-rasterbar-${version}";
 
@@ -27,15 +30,15 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
   nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
-  buildInputs = [ boost openssl zlib python libiconv geoip ];
+  buildInputs = [ boostPython openssl zlib python libiconv geoip ];
   preConfigure = "./autotool.sh";
 
   configureFlags = [
     "--enable-python-binding"
     "--with-libgeoip=system"
     "--with-libiconv=yes"
-    "--with-boost=${boost.dev}"
-    "--with-boost-libdir=${boost.out}/lib"
+    "--with-boost=${boostPython.dev}"
+    "--with-boost-libdir=${boostPython.out}/lib"
     "--with-libiconv=yes"
   ];
 
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index 0f5442bd63b6..c4ff0e892a82 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -5,7 +5,6 @@
 , givaro
 , pkgconfig
 , openblas
-, liblapack
 , fflas-ffpack
 , gmpxx
 , optimize ? false # impure
@@ -30,7 +29,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     givaro
-    (liblapack.override {shared = true;})
     openblas
     gmpxx
     fflas-ffpack
@@ -38,7 +36,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-blas-libs=-lopenblas"
-    "--with-lapack-libs=-llapack"
     "--disable-optimization"
   ] ++ stdenv.lib.optionals (!optimize) [
     # disable SIMD instructions (which are enabled *when available* by default)
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index bfc94e1fac8a..f8a17c9f5c3f 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let # beware: updates often break cups-filters build
-  version = "0.65.0";
+  version = "0.66.0";
   mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
 in
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/poppler-${version}.tar.xz";
-    sha256 = "01wgvpi1l7nqkvixnmhmlpld0fjryhl7rlwvba6agz9yz1rwzj49";
+    sha256 = "1rzar5f27xzkjih07yi8kxcinvk4ny4nhimyacpvqx7vmlqn829c";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix
index 90393cff001c..6bbd43b0c848 100644
--- a/pkgs/development/libraries/science/math/lcalc/default.nix
+++ b/pkgs/development/libraries/science/math/lcalc/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available
     # "newer" version at google code https://code.google.com/archive/p/l-calc/source/default/source
-    url = "http://mirrors.mit.edu/sage/spkg/upstream/lcalc/lcalc-${version}.tar.bz2";
+    url = "mirror://sageupstream/lcalc/lcalc-${version}.tar.bz2";
     sha256 = "1c6dsdshgxhqppjxvxhp8yhpxaqvnz3d1mlh26r571gkq8z2bm43";
   };
 
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index bd095a11f088..fc8f11f2f11e 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -76,14 +76,13 @@ let
     if blas64_ != null
       then blas64_
       else hasPrefix "x86_64" stdenv.system;
-
-  version = "0.3.0";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "openblas-${version}";
+  version = "0.3.1";
   src = fetchurl {
     url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz";
-    sha256 = "18giv3lsh8cva01z4rhsx8jvgliknni0jp7vxkc69qxb14vm8lfg";
+    sha256 = "0czbs2afmcxxij1ivqrm04p0qcksg5fravjifhydvb7k6mpraphz";
     name = "openblas-${version}.tar.gz";
   };
 
diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix
index f38fce5831ee..fda54fe44ab1 100644
--- a/pkgs/development/libraries/science/math/rankwidth/default.nix
+++ b/pkgs/development/libraries/science/math/rankwidth/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://mirrors.mit.edu/sage/spkg/upstream/rw/rw-${version}.tar.gz";
+    url = "mirror://sageupstream/rw/rw-${version}.tar.gz";
     sha256 = "1rv2v42x2506x7f10349m1wpmmfxrv9l032bkminni2gbip9cjg0";
   };
 
diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix
index fe448106b15d..624885c501aa 100644
--- a/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/pkgs/development/libraries/science/math/rubiks/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://mirrors.mit.edu/sage/spkg/upstream/rubiks/rubiks-${version}.tar.bz2";
+    url = "mirror://sageupstream/rubiks/rubiks-${version}.tar.bz2";
     sha256 = "0zdmkb0j1kyspdpsszzb2k3279xij79jkx0dxd9f3ix1yyyg3yfq";
   };
 
diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix
index c83b3d1737cf..c34701e3f913 100644
--- a/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/pkgs/development/libraries/science/math/sympow/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     # Original website no longer reachable
-    url = "http://mirrors.mit.edu/sage/spkg/upstream/sympow/sympow-${version}.tar.bz2";
+    url = "mirror://sageupstream/sympow/sympow-${version}.tar.bz2";
     sha256 = "0hphs7ia1wr5mydf288zvwj4svrymfpadcg3pi6w80km2yg5bm3c";
   };
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    install -d datafiles "$out/share/sympow/datafiles"
+    install -D datafiles/* --target-directory "$out/share/sympow/datafiles/"
     install *.gp "$out/share/sympow/"
     install -Dm755 sympow "$out/share/sympow/sympow"
     install -D new_data "$out/bin/new_data"
diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix
index 53e48eb89317..0185bd2733b4 100644
--- a/pkgs/development/libraries/tachyon/default.nix
+++ b/pkgs/development/libraries/tachyon/default.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
   arch = if stdenv.system == "x86_64-linux"   then "linux-64-thr"  else
          if stdenv.system == "i686-linux"     then "linux-thr"     else
          if stdenv.system == "aarch64-linux"  then "linux-arm-thr" else
+         if stdenv.system == "armv7l-linux"   then "linux-arm-thr" else
          if stdenv.system == "x86_64-darwin"  then "macosx-thr"    else
          if stdenv.system == "i686-darwin"    then "macosx-64-thr" else
          if stdenv.system == "i686-cygwin"    then "win32"         else
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 47686451eee6..2b69f6283d60 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wolfssl-${version}";
-  version = "3.15.0";
+  version = "3.15.3";
 
   src = fetchFromGitHub {
     owner = "wolfSSL";
     repo = "wolfssl";
     rev = "v${version}-stable";
-    sha256 = "1jqhq0dl2zxks7dm6g3dm1zvrl646ab073kgg8ypv19nkd5cvbdv";
+    sha256 = "00mpq1z8j37a873dbk9knb835m3qlwqnd1rslirqkc44hpz1i64j";
   };
 
   outputs = [ "out" "dev" "doc" "lib" ];
diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix
new file mode 100644
index 000000000000..9f723a6da470
--- /dev/null
+++ b/pkgs/development/node-packages/composition-v10.nix
@@ -0,0 +1,17 @@
+# This file has been generated by node2nix 1.6.0. Do not edit!
+
+{pkgs ? import <nixpkgs> {
+    inherit system;
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+
+let
+  nodeEnv = import ./node-env.nix {
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+  };
+in
+import ./node-packages-v10.nix {
+  inherit (pkgs) fetchurl fetchgit;
+  inherit nodeEnv;
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix
new file mode 100644
index 000000000000..9bdba59b5357
--- /dev/null
+++ b/pkgs/development/node-packages/default-v10.nix
@@ -0,0 +1,8 @@
+{pkgs, system, nodejs, stdenv}:
+
+let
+  nodePackages = import ./composition-v10.nix {
+    inherit pkgs system nodejs;
+  };
+in
+nodePackages
diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh
index c3aa741ef806..b34b024f6a2d 100755
--- a/pkgs/development/node-packages/generate.sh
+++ b/pkgs/development/node-packages/generate.sh
@@ -4,3 +4,4 @@
 rm -f node-env.nix
 node2nix -6 -i node-packages-v6.json -o node-packages-v6.nix -c composition-v6.nix
 node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix
+node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix
diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
new file mode 100644
index 000000000000..a298a6b95225
--- /dev/null
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -0,0 +1,5 @@
+[
+  "bower"
+, "coffee-script"
+, "grunt-cli"
+]
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
new file mode 100644
index 000000000000..45b698320431
--- /dev/null
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -0,0 +1,213 @@
+# This file has been generated by node2nix 1.6.0. Do not edit!
+
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+
+let
+  sources = {
+    "abbrev-1.1.1" = {
+      name = "abbrev";
+      packageName = "abbrev";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+      };
+    };
+    "balanced-match-1.0.0" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+      };
+    };
+    "brace-expansion-1.1.11" = {
+      name = "brace-expansion";
+      packageName = "brace-expansion";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+      };
+    };
+    "concat-map-0.0.1" = {
+      name = "concat-map";
+      packageName = "concat-map";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    };
+    "findup-sync-0.3.0" = {
+      name = "findup-sync";
+      packageName = "findup-sync";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz";
+        sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16";
+      };
+    };
+    "glob-5.0.15" = {
+      name = "glob";
+      packageName = "glob";
+      version = "5.0.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
+        sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
+      };
+    };
+    "grunt-known-options-1.1.0" = {
+      name = "grunt-known-options";
+      packageName = "grunt-known-options";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz";
+        sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
+      };
+    };
+    "inflight-1.0.6" = {
+      name = "inflight";
+      packageName = "inflight";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+      };
+    };
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    };
+    "minimatch-3.0.4" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+      };
+    };
+    "nopt-3.0.6" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "3.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz";
+        sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
+      };
+    };
+    "once-1.4.0" = {
+      name = "once";
+      packageName = "once";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+      };
+    };
+    "path-is-absolute-1.0.1" = {
+      name = "path-is-absolute";
+      packageName = "path-is-absolute";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+      };
+    };
+    "resolve-1.1.7" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
+        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+      };
+    };
+    "wrappy-1.0.2" = {
+      name = "wrappy";
+      packageName = "wrappy";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+      };
+    };
+  };
+in
+{
+  bower = nodeEnv.buildNodePackage {
+    name = "bower";
+    packageName = "bower";
+    version = "1.8.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz";
+      sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The browser package manager";
+      homepage = http://bower.io/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
+  coffee-script = nodeEnv.buildNodePackage {
+    name = "coffee-script";
+    packageName = "coffee-script";
+    version = "1.12.7";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz";
+      sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Unfancy JavaScript";
+      homepage = http://coffeescript.org/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
+  grunt-cli = nodeEnv.buildNodePackage {
+    name = "grunt-cli";
+    packageName = "grunt-cli";
+    version = "1.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz";
+      sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8";
+    };
+    dependencies = [
+      sources."abbrev-1.1.1"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."concat-map-0.0.1"
+      sources."findup-sync-0.3.0"
+      sources."glob-5.0.15"
+      sources."grunt-known-options-1.1.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."minimatch-3.0.4"
+      sources."nopt-3.0.6"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."resolve-1.1.7"
+      sources."wrappy-1.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The grunt command line interface";
+      homepage = "https://github.com/gruntjs/grunt-cli#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix
index d335cbc556cb..594012693936 100644
--- a/pkgs/development/python-modules/aioimaplib/default.nix
+++ b/pkgs/development/python-modules/aioimaplib/default.nix
@@ -1,21 +1,24 @@
 { lib, buildPythonPackage, fetchFromGitHub, pythonOlder
-, nose, asynctest, mock, pytz, tzlocal, imaplib2, docutils }:
+, nose, asynctest, mock, pytz, tzlocal, imaplib2, docutils, pyopenssl }:
 
 buildPythonPackage rec {
   pname = "aioimaplib";
-  version = "0.7.13";
+  version = "0.7.14";
 
   # PyPI tarball doesn't ship tests
   src = fetchFromGitHub {
     owner = "bamthomas";
     repo = pname;
     rev = version;
-    sha256 = "19yhk4ixfw46d0bvx6a40r23nvia5a83dzn5rzwaq1wdjr186bbn";
+    sha256 = "150v3czh53sqakfqgjyj1w39mdfcxmpnrk2pbmq63jkq7r6njl0l";
   };
 
-  disbaled = pythonOlder "3.4";
+  disabled = pythonOlder "3.4";
 
-  checkInputs = [ nose asynctest mock pytz tzlocal imaplib2 docutils ];
+  checkInputs = [ nose asynctest mock pytz tzlocal imaplib2 docutils pyopenssl ];
+
+  # https://github.com/bamthomas/aioimaplib/issues/35
+  doCheck = false;
 
   meta = with lib; {
     description = "Python asyncio IMAP4rev1 client library";
diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix
index a0f408764a0d..0004badd6f40 100644
--- a/pkgs/development/python-modules/asynctest/default.nix
+++ b/pkgs/development/python-modules/asynctest/default.nix
@@ -2,16 +2,13 @@
 
 buildPythonPackage rec {
   pname = "asynctest";
-  version = "0.12.0";
+  version = "0.12.2";
 
   disabled = pythonOlder "3.4";
 
-  # PyPI tarball doesn't ship test/__init__.py
-  src = fetchFromGitHub {
-    owner = "Martiusweb";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0rcb3kz2m0iwvgxpx2avfz9cqsd9xbaq93zykr2fki3ikmnp3vyg";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "77520850ae21620ec31738f4a7b467acaa44de6d3752d8ac7a9f4dcf55d77853";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix
index 56d997c6b325..dc88c4d94f7a 100644
--- a/pkgs/development/python-modules/cysignals/default.nix
+++ b/pkgs/development/python-modules/cysignals/default.nix
@@ -2,9 +2,11 @@
 , fetchPypi
 , buildPythonPackage
 , cython
-, sphinx
+, pariSupport ? true, pari # for interfacing with the PARI/GP signal handler
 }:
 
+assert pariSupport -> pari != null;
+
 buildPythonPackage rec {
   pname = "cysignals";
   version = "1.7.1";
@@ -14,6 +16,8 @@ buildPythonPackage rec {
     sha256 = "15nky8siwlc7s8v23vv4m0mnxa1z6jcs2qfr26m2mkw9j9g2na2j";
   };
 
+  # explicit check:
+  # build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE"
   hardeningDisable = [
     "fortify"
   ];
@@ -26,6 +30,10 @@ buildPythonPackage rec {
     export PATH="$out/bin:$PATH"
   '';
 
+  buildInputs = lib.optionals pariSupport [
+    pari
+  ];
+
   propagatedBuildInputs = [
     cython
   ];
diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index e49d8c6ff84c..775660b8304c 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
-, django, python-openid, mock, coverage }:
+, django, python3-openid, mock, coverage }:
 
 buildPythonPackage rec {
   pname = "django-allauth";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     sha256 = "1c863cmd521j6cwpyd50jxz5y62fdschrhm15jfqihicyr9imjan";
   };
 
-  propagatedBuildInputs = [ requests requests_oauthlib django python-openid ];
+  propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ];
 
   checkInputs = [ coverage mock ];
 
diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix
new file mode 100644
index 000000000000..3642d4e55b90
--- /dev/null
+++ b/pkgs/development/python-modules/fido2/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, six, cryptography }:
+
+buildPythonPackage rec {
+  pname = "fido2";
+  version = "0.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ddbhg4nsabi9w66l8vkr0i5r80jqihlic5yrdl3v1aqahvxph1j";
+  };
+
+  # The pypi package does not include tests
+  # Check https://github.com/Yubico/python-fido2/pull/8
+  doCheck = false;
+
+  propagatedBuildInputs = [ six cryptography ];
+
+  meta = with lib; {
+    description = "Provides library functionality for FIDO 2.0, including communication with a device over USB.";
+    homepage = https://github.com/Yubico/python-fido2;
+    license = licenses.mpl20;
+  };
+}
diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix
index 95e457de81d3..f36d7fbca1c4 100644
--- a/pkgs/development/python-modules/flask-autoindex/default.nix
+++ b/pkgs/development/python-modules/flask-autoindex/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchpatch
-, fetchPypi
+, fetchFromGitHub
 , flask
 , flask-silk
 , future
@@ -9,11 +8,16 @@
 
 buildPythonPackage rec {
   pname = "Flask-AutoIndex";
-  version = "0.6";
+  version = "2018-06-28";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "19b10mb1nrqfjyafki6wnrbn8mqi30bbyyiyvp5xssc74pciyfqs";
+  # master fixes various issues (binary generation, flask syntax) and has no
+  # major changes
+  # new release requested: https://github.com/sublee/flask-autoindex/issues/38
+  src = fetchFromGitHub {
+    owner = "sublee";
+    repo = "flask-autoindex";
+    rev = "e3d449a89d56bf4c171c7c8d90af028e579782cf";
+    sha256 = "0bwq2nid4h8vrxspggk064vra4wd804cl2ryyx4j2d1dyywmgjgy";
   };
 
   propagatedBuildInputs = [
@@ -22,15 +26,6 @@ buildPythonPackage rec {
     future
   ];
 
-  patches = [
-    # fix generated binary, see https://github.com/sublee/flask-autoindex/pull/32
-    (fetchpatch {
-      name = "fix_binary.patch";
-      url = "https://github.com/sublee/flask-autoindex/pull/32.patch";
-      sha256 = "1v2r0wvi7prhipjq89774svv6aqj0a13mdfj07pdlkpzfbf029dn";
-    })
-  ];
-
   meta = with stdenv.lib; {
     description = "The mod_autoindex for Flask";
     longDescription = ''
diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix
index e494f22a4762..edc873458a11 100644
--- a/pkgs/development/python-modules/flask-silk/default.nix
+++ b/pkgs/development/python-modules/flask-silk/default.nix
@@ -1,16 +1,20 @@
 { stdenv
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , flask
 }:
 
 buildPythonPackage rec {
   pname = "Flask-Silk";
-  version = "0.2";
+  version = "2018-06-28";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1gjzighx4f0w39sq9xvzr1kwb4y7yv9qrgzvli1p89gy16piz8l0";
+  # master fixes flask import syntax and has no major changes
+  # new release requested: https://github.com/sublee/flask-silk/pull/6
+  src = fetchFromGitHub {
+    owner = "sublee";
+    repo = "flask-silk";
+    rev = "3a8166550f9a0ec52edae7bf31d9818c4c15c531";
+    sha256 = "0mplziqw52jfspas6vsm210lmxqqzgj0dxm8y0i3gpbyyykwcmh0";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix
index d1d25f5407c2..d73940e56a6d 100644
--- a/pkgs/development/python-modules/langcodes/default.nix
+++ b/pkgs/development/python-modules/langcodes/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A toolkit for working with and comparing the standardized codes for languages, such as ‘en’ for English or ‘es’ for Spanish";
-    homepage =  http://github.com/LuminosoInsight/langcodes;
+    homepage =  https://github.com/LuminosoInsight/langcodes;
     license = licenses.mit;
     maintainers = with maintainers; [ ixxie ];
   };
diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index 9fd050ac35ed..8b321b911ccd 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -20,8 +20,8 @@ buildPythonPackage rec {
 
   meta = {
     description = "Pythonic binding for the libxml2 and libxslt libraries";
-    homepage = http://lxml.de;
+    homepage = https://lxml.de;
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ sjourdois ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix
index 58193590308e..5368a4f878e0 100644
--- a/pkgs/development/python-modules/pendulum/default.nix
+++ b/pkgs/development/python-modules/pendulum/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchPypi, buildPythonPackage, dateutil, pytzdata, tzlocal }:
+{ lib, fetchPypi, buildPythonPackage, pythonOlder
+, dateutil, pytzdata, typing }:
 
 buildPythonPackage rec {
   pname = "pendulum";
@@ -9,12 +10,12 @@ buildPythonPackage rec {
     sha256 = "544e44d8a92954e5ef4db4fa8b662d3282f2ac7b7c2cbf4227dc193ba78b9e1e";
   };
 
-  propagatedBuildInputs = [ dateutil pytzdata tzlocal ];
+  propagatedBuildInputs = [ dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing;
 
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python datetimes made easy";
     homepage = https://github.com/sdispater/pendulum;
     license = licenses.mit;
diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix
new file mode 100644
index 000000000000..946fb1a054fe
--- /dev/null
+++ b/pkgs/development/python-modules/pybrowserid/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, requests, mock }:
+
+buildPythonPackage rec {
+  pname = "PyBrowserID";
+  version = "0.14.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1qvi79kfb8x9kxkm5lw2mp42hm82cpps1xknmsb5ghkwx1lpc8kc";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  checkInputs = [ mock ];
+
+  meta = with stdenv.lib; {
+    description = "Python library for the BrowserID Protocol";
+    homepage    = https://github.com/mozilla/PyBrowserID;
+    license     = licenses.mpl20;
+    maintainers = with maintainers; [ worldofpeace ];
+  };
+}
+
diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix
index 015233fba8e6..a0dd6113b750 100644
--- a/pkgs/development/python-modules/pymc3/default.nix
+++ b/pkgs/development/python-modules/pymc3/default.nix
@@ -57,7 +57,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)";
-    homepage = http://github.com/pymc-devs/pymc3;
+    homepage = https://github.com/pymc-devs/pymc3;
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ ilya-kolpakov ];
   };
diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix
index cfa24fdfe528..e0be487e86d3 100644
--- a/pkgs/development/python-modules/pytest-httpbin/default.nix
+++ b/pkgs/development/python-modules/pytest-httpbin/default.nix
@@ -28,6 +28,9 @@ buildPythonPackage rec {
     py.test
   '';
 
+  # https://github.com/kevin1024/pytest-httpbin/pull/51
+  doCheck = false;
+
   meta = {
     description = "Easily test your HTTP library against a local copy of httpbin.org";
     homepage = https://github.com/kevin1024/pytest-httpbin;
diff --git a/pkgs/development/python-modules/python-openid/default.nix b/pkgs/development/python-modules/python-openid/default.nix
deleted file mode 100644
index b70d9a1f082f..000000000000
--- a/pkgs/development/python-modules/python-openid/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
-
-buildPythonPackage rec {
-  pname = "python-openid";
-  version = "2.2.5";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1vvhxlghjan01snfdc4k7ykd80vkyjgizwgg9bncnin8rqz1ricj";
-  };
-
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "OpenID support for modern servers and consumers";
-    homepage = https://github.com/openid/python-openid;
-    license = licenses.asl20;
-  };
-}
diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix
index 77181fa4ae54..d0b10c42d019 100644
--- a/pkgs/development/python-modules/python3-openid/default.nix
+++ b/pkgs/development/python-modules/python3-openid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, defusedxml }:
+{ stdenv, isPy3k, buildPythonPackage, fetchPypi, defusedxml }:
 
 buildPythonPackage rec {
   pname = "python3-openid";
@@ -13,9 +13,11 @@ buildPythonPackage rec {
 
   doCheck = false;
 
+  disabled = !isPy3k;
+
   meta = with stdenv.lib; {
     description = "OpenID support for modern servers and consumers";
-    homepage = http://github.com/necaris/python3-openid;
+    homepage = https://github.com/necaris/python3-openid;
     license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix
new file mode 100644
index 000000000000..152a61bbf1d4
--- /dev/null
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi, xmltodict, requests
+
+# Test dependencies
+, pytest, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx
+, sphinx_rtd_theme
+}:
+
+buildPythonPackage rec {
+  pname = "soco";
+  version = "0.15";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "18bxpbd7l9gns0jpvx09z023kbbz7b6i4f99i8silsb1jv682kg0";
+  };
+
+  propagatedBuildInputs = [ xmltodict requests ];
+  checkInputs = [
+    pytest pytestcov coveralls pylint flake8 graphviz mock sphinx
+    sphinx_rtd_theme
+  ];
+
+  meta = {
+    homepage = http://python-soco.com/;
+    description = "A CLI and library to control Sonos speakers";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix
index 67c799e554eb..f41f2e7b4fa1 100644
--- a/pkgs/development/python-modules/sympy/default.nix
+++ b/pkgs/development/python-modules/sympy/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , glibcLocales
 , mpmath
 }:
@@ -25,10 +26,26 @@ buildPythonPackage rec {
     export LANG="en_US.UTF-8"
   '';
 
+  patches = [
+    # see https://trac.sagemath.org/ticket/20204 and https://github.com/sympy/sympy/issues/12825
+    # There is also an upstream patch for this, included in the next release (PR #128826).
+    # However that doesn't quite fix the issue yet. Apparently some changes by sage are required.
+    # TODO re-evaluate the change once a new sympy version is released (open a sage trac ticket about
+    # it).
+    (fetchpatch {
+      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympy/patches/03_undeffun_sage.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      sha256 = "1mh2va1rlgizgvx8yzqwgvbf5wvswarn511002b361mc8yy0bnhr";
+    })
+    (fetchpatch {
+      url = "https://github.com/sympy/sympy/pull/13276.patch";
+      sha256 = "1rz74b5c74vwh3pj9axxgh610i02l3555vvsvr4a15ya7siw7zxh";
+    })
+  ];
+
   meta = {
     description = "A Python library for symbolic mathematics";
     homepage    = http://www.sympy.org/;
     license     = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ lovek323 ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 6d72e234ddc4..14ccac5690bc 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -17,6 +17,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
+    extension = "tar.bz2";
     sha256 = "a4cc164a781859c74de47f17f0e85f4bce8a3321a9d0892c015c8f80c4158ad9";
   };
 
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index da60b77934b0..34b9e53f6e47 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,17 +1,19 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "8.10.1";
+  version = "8.11";
   name = "checkstyle-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "18i1a6v9dg08in68g584y7bhf76g59pp8lyixqc3v6wgj3ksv8q9";
+    url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
+    sha256 = "13x4m4rn7rix64baclcm2jqbizkj38njif2ba0ycmvyjm62smfwv";
   };
 
+  phases = [ "installPhase" ];
+
   installPhase = ''
     mkdir -p $out/checkstyle
-    cp -R * $out/checkstyle
+    cp $src $out/checkstyle/checkstyle-all.jar
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index e738d30543ed..78dd57789622 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pmd-${version}";
-  version = "6.4.0";
+  version = "6.5.0";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
     url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
-    sha256 = "17yjjmqcn1fy3bj73nh5i84yc7wappza612a0iwg0lqqn4yl7lyn";
+    sha256 = "10jdgps1ikx75ljp2gi76ff7payg28pmiy5y3vp17gg47mv991aw";
   };
 
   installPhase = ''
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index 2f4daa2edc86..c5ab3fafc5e6 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, makeWrapper, gcc, ncurses }:
+{ stdenv, fetchFromGitLab, makeWrapper, gcc, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "icmake-${version}";
-  version = "9.02.07";
+  version = "9.02.08";
 
-  src = fetchFromGitHub {
-    sha256 = "1q3rwri5s1sqm4h75bahkjnlym4bk2ygg4fb75yrniwnj8rhdp12";
+  src = fetchFromGitLab {
+    sha256 = "1pr5lagmdls3clzwa2xwcfa3k5750rf7i0j3zld0xirb41zx07q2";
     rev = version;
     repo = "icmake";
     owner = "fbb-git";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A program maintenance (make) utility using a C-like grammar";
-    homepage = https://fbb-git.github.io/icmake/;
+    homepage = https://fbb-git.gitlab.io/icmake/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ pSub ];
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
index 8c2365974843..82b224b37f42 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -13,14 +13,14 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
 
 stdenv.mkDerivation rec {
   name = "dialog-${version}";
-  version = "1.3-20171209";
+  version = "1.3-20180621";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/dialog/${name}.tgz"
       "https://invisible-mirror.net/archives/dialog/${name}.tgz"
     ];
-    sha256 = "1rk72as52f5br3wcr74d00wib41w65g8wvi36mfgybly251984r0";
+    sha256 = "0yjqczlf64yppgvk4i6s0jm06mdr0mb5m6sj39nf891dnbi5jj2a";
   };
 
   buildInputs = [ ncurses ];
diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix
index 8d2e67859005..f58d06599650 100644
--- a/pkgs/development/tools/misc/epm/default.nix
+++ b/pkgs/development/tools/misc/epm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The ESP Package Manager generates distribution archives for a variety of platforms";
-    homepage = http://www.msweet.org/projects.php?Z2;
+    homepage = https://www.msweet.org/projects.php?Z2;
     license = licenses.gpl2;
     maintainers = with maintainers; [ pSub ];
     platforms = platforms.unix;
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 9c0c357e1867..4d8a9b05847a 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   name = "fswatch-${version}";
-  version = "1.11.3";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "emcrisostomo";
     repo = "fswatch";
     rev = version;
-    sha256 = "1w83bpgx0wsgn70jyxwrvh9dsivrq41ifcignjzdxdwz9j0rwhh1";
+    sha256 = "16f3g6s79gs1sp2ra3cka4c5mf5b557cx697bwcdfgj6r19ni5j7";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 1f5ead84677b..76130f255fde 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, perl, icmake, utillinux }:
+{ stdenv, fetchFromGitLab, perl, icmake, utillinux }:
 
 stdenv.mkDerivation rec {
   name = "yodl-${version}";
-  version = "4.02.00";
+  version = "4.02.01";
 
   nativeBuildInputs = [ icmake ];
 
   buildInputs = [ perl ];
 
-  src = fetchFromGitHub {
-    sha256 = "08i3q3h581kxr5v7wi114bng66pwwsjs5qj3ywnnrr7ra1h5rzwa";
+  src = fetchFromGitLab {
+    sha256 = "0m8idd8m3z27rix55avchm21sd2spcxgrdf63w65zpvnywq0ydax";
     rev = version;
     repo = "yodl";
     owner = "fbb-git";
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A package that implements a pre-document language and tools to process it";
-    homepage = https://fbb-git.github.io/yodl/;
+    homepage = https://fbb-git.gitlab.io/yodl/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ pSub ];
     platforms = platforms.linux;