diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 619f36cd515..4101ef82f3e 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -290,8 +290,8 @@ in
           ln -s /run/systemd/resolve/resolv.conf /run/resolvconf/interfaces/systemd
         ''}
 
-        # Make sure resolv.conf is up to date if not managed by systemd
-        ${optionalString (!config.services.resolved.enable) ''
+        # Make sure resolv.conf is up to date if not managed manually or by systemd
+        ${optionalString (!config.environment.etc?"resolv.conf") ''
           ${pkgs.openresolv}/bin/resolvconf -u
         ''}
       '';
diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix
index df2adb9f276..7b0e9981cbb 100644
--- a/nixos/modules/services/monitoring/statsd.nix
+++ b/nixos/modules/services/monitoring/statsd.nix
@@ -9,6 +9,12 @@ let
   isBuiltinBackend = name:
     builtins.elem name [ "graphite" "console" "repeater" ];
 
+  backendsToPackages = let
+    mkMap = list: name:
+      if isBuiltinBackend name then list
+      else list ++ [ pkgs.nodePackages.${name} ];
+  in foldl mkMap [];
+
   configFile = pkgs.writeText "statsd.conf" ''
     {
       address: "${cfg.listenAddress}",
@@ -27,13 +33,21 @@ let
         prettyprint: false
       },
       log: {
-        backend: "syslog"
+        backend: "stdout"
       },
       automaticConfigReload: false${optionalString (cfg.extraConfig != null) ","}
       ${cfg.extraConfig}
     }
   '';
 
+  deps = pkgs.buildEnv {
+    name = "statsd-runtime-deps";
+    pathsToLink = [ "/lib" ];
+    ignoreCollisions = true;
+
+    paths = backendsToPackages cfg.backends;
+  };
+
 in
 
 {
@@ -42,11 +56,7 @@ in
 
   options.services.statsd = {
 
-    enable = mkOption {
-      description = "Whether to enable statsd stats aggregation service";
-      default = false;
-      type = types.bool;
-    };
+    enable = mkEnableOption "statsd";
 
     listenAddress = mkOption {
       description = "Address that statsd listens on over UDP";
@@ -110,6 +120,11 @@ in
 
   config = mkIf cfg.enable {
 
+    assertions = map (backend: {
+      assertion = !isBuiltinBackend backend -> hasAttrByPath [ backend ] pkgs.nodePackages;
+      message = "Only builtin backends (graphite, console, repeater) or backends enumerated in `pkgs.nodePackages` are allowed!";
+    }) cfg.backends;
+
     users.extraUsers = singleton {
       name = "statsd";
       uid = config.ids.uids.statsd;
@@ -120,9 +135,7 @@ in
       description = "Statsd Server";
       wantedBy = [ "multi-user.target" ];
       environment = {
-        NODE_PATH=concatMapStringsSep ":"
-          (pkg: "${builtins.getAttr pkg pkgs.statsd.nodePackages}/lib/node_modules")
-          (filter (name: !isBuiltinBackend name) cfg.backends);
+        NODE_PATH = "${deps}/lib/node_modules";
       };
       serviceConfig = {
         ExecStart = "${pkgs.statsd}/bin/statsd ${configFile}";
diff --git a/nixos/release.nix b/nixos/release.nix
index d5093a7883e..84e39cd91dc 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -332,6 +332,7 @@ in rec {
   tests.slim = callTest tests/slim.nix {};
   tests.smokeping = callTest tests/smokeping.nix {};
   tests.snapper = callTest tests/snapper.nix {};
+  tests.statsd = callTest tests/statsd.nix {};
   tests.switchTest = callTest tests/switch-test.nix {};
   tests.taskserver = callTest tests/taskserver.nix {};
   tests.tomcat = callTest tests/tomcat.nix {};
diff --git a/nixos/tests/statsd.nix b/nixos/tests/statsd.nix
new file mode 100644
index 00000000000..d6bbc390163
--- /dev/null
+++ b/nixos/tests/statsd.nix
@@ -0,0 +1,40 @@
+import ./make-test.nix ({ pkgs, lib }:
+
+with lib;
+
+{
+  name = "statsd";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ ma27 ];
+  };
+
+  nodes.statsd1 = {
+    services.statsd.enable = true;
+    services.statsd.backends = [ "statsd-influxdb-backend" "console" ];
+    services.statsd.extraConfig = ''
+      influxdb: {
+        username: "root",
+        password: "root",
+        database: "statsd"
+      }
+    '';
+
+    services.influxdb.enable = true;
+
+    systemd.services.influx-init = {
+      description = "Setup Influx Test Base";
+      after = [ "influxdb.service" ];
+      before = [ "statsd.service" ];
+
+      script = ''
+        echo "CREATE DATABASE statsd" | ${pkgs.influxdb}/bin/influx
+      '';
+    };
+  };
+
+  testScript = ''
+    $statsd1->start();
+    $statsd1->waitForUnit("statsd.service");
+    $statsd1->succeed("nc -z 127.0.0.1 8126");
+  '';
+})
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 9b448f86736..d2bbef7f581 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper
+{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook
 , openssl, curl, libevent, inotify-tools, systemd, zlib
 , enableGTK3 ? false, gtk3
 , enableSystemd ? stdenv.isLinux
@@ -20,9 +20,10 @@ stdenv.mkDerivation rec {
     sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ]
+    ++ optionals enableGTK3 [ wrapGAppsHook ];
   buildInputs = [ intltool file openssl curl libevent zlib ]
-    ++ optionals enableGTK3 [ gtk3 makeWrapper ]
+    ++ optionals enableGTK3 [ gtk3 ]
     ++ optionals enableSystemd [ systemd ]
     ++ optionals stdenv.isLinux [ inotify-tools ];
 
@@ -41,10 +42,8 @@ stdenv.mkDerivation rec {
     ++ optional enableSystemd "--with-systemd-daemon"
     ++ optional enableGTK3 "--with-gtk";
 
-  preFixup = optionalString enableGTK3 /* gsettings schemas for file dialogues */ ''
+  preFixup = optionalString enableGTK3 ''
     rm "$out/share/icons/hicolor/icon-theme.cache"
-    wrapProgram "$out/bin/transmission-gtk" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
   NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation";
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index fdd7c2013b4..baaa150b5a0 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1322,6 +1322,19 @@ rec {
       archs = ["noarch" "x86_64"];
       packages = commonCentOSPackages ++ [ "procps-ng" ];
     };
+
+    centos74x86_64 = rec {
+      name = "centos-7.4-x86_64";
+      fullName = "CentOS 7.4 (x86_64)";
+      # N.B. Switch to vault.centos.org when the next release comes out
+      urlPrefix = http://mirror.centos.org/centos-7/7.4.1708/os/x86_64;
+      packagesList = fetchurl {
+        url = "${urlPrefix}/repodata/b686d3a0f337323e656d9387b9a76ce6808b26255fc3a138b1a87d3b1cb95ed5-primary.xml.gz";
+        sha256 = "1mayp4f3nzd8n4wa3hsz4lk8p076djkvk1wkdmjkwcipyfhd71mn";
+      };
+      archs = ["noarch" "x86_64"];
+      packages = commonCentOSPackages ++ [ "procps-ng" ];
+    };
   };
 
 
diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index 62ccb636034..bf39965bf77 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -7,7 +7,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
 
   buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
-                  gnome3.gsettings_desktop_schemas
                   intltool docbook_xsl docbook_xsl_ns gnome3.dconf ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix
deleted file mode 100644
index 29a8618dc7b..00000000000
--- a/pkgs/development/compilers/dmd/2.067.1.nix
+++ /dev/null
@@ -1,167 +0,0 @@
-{ stdenv, fetchFromGitHub
-, makeWrapper, unzip, which
-, curl, tzdata
-}:
-
-stdenv.mkDerivation rec {
-  name = "dmd-${version}";
-  # This is the last version of dmd which is buildable without a D compiler.
-  # So we use this as a bootstrap version.
-  # The DMD frontend has been ported to D in 2.069.0 but idgen was already
-  # ported in 2.068.0.
-  version = "2.067.1";
-
-  srcs = [
-  (fetchFromGitHub {
-    owner = "dlang";
-    repo = "dmd";
-    rev = "v${version}";
-    sha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz";
-    name = "dmd-v${version}-src";
-  })
-  (fetchFromGitHub {
-    owner = "dlang";
-    repo = "druntime";
-    rev = "v${version}";
-    sha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02";
-    name = "druntime-v${version}-src";
-  })
-  (fetchFromGitHub {
-    owner = "dlang";
-    repo = "phobos";
-    rev = "v${version}";
-    sha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1";
-    name = "phobos-v${version}-src";
-  })
-  ];
-
-  sourceRoot = ".";
-
-  postUnpack = ''
-      mv dmd-v${version}-src dmd
-      mv druntime-v${version}-src druntime
-      mv phobos-v${version}-src phobos
-  '';
-
-  # Compile with PIC to prevent colliding modules with binutils 2.28.
-  # https://issues.dlang.org/show_bug.cgi?id=17375
-  usePIC = "-fPIC";
-  ROOT_HOME_DIR = "$(echo ~root)";
-
-  postPatch = ''
-      # Ugly hack so the dlopen call has a chance to succeed.
-      # https://issues.dlang.org/show_bug.cgi?id=15391
-      substituteInPlace phobos/std/net/curl.d \
-          --replace libcurl.so ${curl.out}/lib/libcurl.so
-
-      # Ugly hack to fix the hardcoded path to zoneinfo in the source file.
-      # https://issues.dlang.org/show_bug.cgi?id=15391
-      substituteInPlace phobos/std/datetime.d \
-          --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/
-
-      substituteInPlace druntime/test/shared/Makefile \
-          --replace "DFLAGS:=" "DFLAGS:=${usePIC} "
-
-      # phobos uses curl, so we need to patch the path to the lib.
-      substituteInPlace phobos/posix.mak \
-          --replace "-soname=libcurl.so.4" "-soname=${curl.out}/lib/libcurl.so.4"
-
-      # Use proper C++ compiler
-      substituteInPlace dmd/src/posix.mak \
-          --replace g++ $CXX
-  ''
-
-  + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace dmd/src/root/port.c \
-        --replace "#include <bits/mathdef.h>" "#include <complex.h>"
-
-      # See https://github.com/NixOS/nixpkgs/issues/29443
-      substituteInPlace phobos/std/path.d \
-          --replace "\"/root" "\"${ROOT_HOME_DIR}"
-  ''
-
-  + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace dmd/src/posix.mak \
-          --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_
-
-      # Was not able to compile on darwin due to "__inline_isnanl"
-      # being undefined.
-      substituteInPlace dmd/src/root/port.c --replace __inline_isnanl __inline_isnan
-  '';
-
-  nativeBuildInputs = [ makeWrapper unzip which ];
-  buildInputs = [ curl tzdata ];
-
-  # Buid and install are based on http://wiki.dlang.org/Building_DMD
-  buildPhase = ''
-      cd dmd
-      make -f posix.mak INSTALL_DIR=$out
-      export DMD=$PWD/src/dmd
-      cd ../druntime
-      make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD
-      cd ../phobos
-      make -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD
-      cd ..
-  '';
-
-  # disable check phase because some tests are not working with sandboxing
-  doCheck = false;
-
-  checkPhase = ''
-      cd dmd
-      export DMD=$PWD/src/dmd
-      cd ../druntime
-      make -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release
-      cd ../phobos
-      make -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release
-      cd ..
-  '';
-
-  installPhase = ''
-      cd dmd
-      mkdir $out
-      mkdir $out/bin
-      cp $PWD/src/dmd $out/bin
-      mkdir -p $out/share/man/man1
-      mkdir -p $out/share/man/man5
-      cp -r docs/man/man1/* $out/share/man/man1/
-      cp -r docs/man/man5/* $out/share/man/man5/
-
-      cd ../druntime
-      mkdir $out/include
-      mkdir $out/include/d2
-      cp -r import/* $out/include/d2
-
-      cd ../phobos
-      mkdir $out/lib
-      ${
-          let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
-          osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name;
-          extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; in
-          "cp generated/${osname}/release/${bits}/libphobos2.${extension} $out/lib"
-      }
-
-      cp -r std $out/include/d2
-      cp -r etc $out/include/d2
-
-      wrapProgram $out/bin/dmd \
-          --prefix PATH ":" "${stdenv.cc}/bin" \
-          --set-default CC "$CC"
-
-      cd $out/bin
-      tee dmd.conf << EOF
-      [Environment]
-      DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--export-dynamic"} -fPIC
-      EOF
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Official reference compiler for the D language";
-    homepage = http://dlang.org/;
-    # Everything is now Boost licensed, even the backend.
-    # https://github.com/dlang/dmd/pull/6680
-    license = licenses.boost;
-    platforms = platforms.unix;
-  };
-}
-
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index ff19a5b872c..d20d2a7e8ed 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -1,173 +1,287 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, overrideCC, gcc5
 , makeWrapper, unzip, which
 , curl, tzdata, gdb, darwin
-# Versions 2.070.2 and up require a working dmd compiler to build:
-, bootstrapDmd }:
+, callPackage
+, bootstrapVersion ? false
+, version ? "2.075.1"
+, dmdSha256 ? "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5"
+, druntimeSha256 ? "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j"
+, phobosSha256 ? "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04"
+}:
 
-stdenv.mkDerivation rec {
-  name = "dmd-${version}";
-  version = "2.075.1";
+let
 
-  srcs = [
-  (fetchFromGitHub {
-    owner = "dlang";
-    repo = "dmd";
-    rev = "v${version}";
-    sha256 = "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5";
-    name = "dmd-v${version}-src";
-  })
-  (fetchFromGitHub {
-    owner = "dlang";
-    repo = "druntime";
-    rev = "v${version}";
-    sha256 = "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j";
-    name = "druntime-v${version}-src";
-  })
-  (fetchFromGitHub {
-    owner = "dlang";
-    repo = "phobos";
-    rev = "v${version}";
-    sha256 = "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04";
-    name = "phobos-v${version}-src";
-  })
-  ];
+  bootstrapDmd = if !bootstrapVersion then
+    # Versions 2.070.2 and up require a working dmd compiler to build so we just
+    # use the last dmd without any D code to bootstrap the actual build.
+    callPackage ./default.nix {
+      stdenv = if stdenv.hostPlatform.isDarwin then
+                 stdenv
+               else
+                 # Doesn't build with gcc6 on linux
+                 overrideCC stdenv gcc5;
+      bootstrapVersion = true;
+      version = "2.067.1";
+      dmdSha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz";
+      druntimeSha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02";
+      phobosSha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1";
+    }
+  else
+    "";
 
-  sourceRoot = ".";
+  dmdBuild = stdenv.mkDerivation rec {
+    name = "dmdBuild-${version}";
+    inherit version;
 
-  postUnpack = ''
-      mv dmd-v${version}-src dmd
-      mv druntime-v${version}-src druntime
-      mv phobos-v${version}-src phobos
+    enableParallelBuilding = true;
 
-      # Remove cppa test for now because it doesn't work.
-      rm dmd/test/runnable/cppa.d
-      rm dmd/test/runnable/extra-files/cppb.cpp
-  '';
+    srcs = [
+    (fetchFromGitHub {
+      owner = "dlang";
+      repo = "dmd";
+      rev = "v${version}";
+      sha256 = dmdSha256;
+      name = "dmd";
+    })
+    (fetchFromGitHub {
+      owner = "dlang";
+      repo = "druntime";
+      rev = "v${version}";
+      sha256 = druntimeSha256;
+      name = "druntime";
+    })
+    (fetchFromGitHub {
+      owner = "dlang";
+      repo = "phobos";
+      rev = "v${version}";
+      sha256 = phobosSha256;
+      name = "phobos";
+    })
+    ];
 
-  # Compile with PIC to prevent colliding modules with binutils 2.28.
-  # https://issues.dlang.org/show_bug.cgi?id=17375
-  usePIC = "-fPIC";
+    sourceRoot = ".";
 
-  postPatch = ''
-      # Ugly hack so the dlopen call has a chance to succeed.
-      # https://issues.dlang.org/show_bug.cgi?id=15391
-      substituteInPlace phobos/std/net/curl.d \
-          --replace libcurl.so ${curl.out}/lib/libcurl.so
+    postUnpack = ''
+        patchShebangs .
 
-      # Ugly hack to fix the hardcoded path to zoneinfo in the source file.
-      # https://issues.dlang.org/show_bug.cgi?id=15391
-      substituteInPlace phobos/std/datetime/timezone.d \
-          --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/
-
-      substituteInPlace druntime/test/common.mak \
-          --replace "DFLAGS:=" "DFLAGS:=${usePIC} "
-
-      # phobos uses curl, so we need to patch the path to the lib.
-      substituteInPlace phobos/posix.mak \
-          --replace "-soname=libcurl.so.4" "-soname=${curl.out}/lib/libcurl.so.4"
-
-      # Use proper C++ compiler
-      substituteInPlace dmd/posix.mak \
-          --replace g++ $CXX
-  ''
-
-    + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
-        substituteInPlace dmd/posix.mak \
-            --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_
+        # Remove cppa test for now because it doesn't work.
+        rm dmd/test/runnable/cppa.d
+        rm dmd/test/runnable/extra-files/cppb.cpp
     '';
 
-  nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which gdb ]
+    # Compile with PIC to prevent colliding modules with binutils 2.28.
+    # https://issues.dlang.org/show_bug.cgi?id=17375
+    usePIC = "-fPIC";
+    ROOT_HOME_DIR = "$(echo ~root)";
 
-  ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
-    Foundation
-  ]);
+    datetimePath = if bootstrapVersion then
+      "phobos/std/datetime.d"
+    else
+      "phobos/std/datetime/timezone.d";
 
-  buildInputs = [ curl tzdata ];
+    phobosPatches = ''
+        substituteInPlace ${datetimePath} \
+            --replace "import core.time;" "import core.time;import std.path;"
 
-  # Buid and install are based on http://wiki.dlang.org/Building_DMD
-  buildPhase = ''
-      cd dmd
-      make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out
-      ${
-          let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
-          osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in
-          "export DMD=$PWD/generated/${osname}/release/${bits}/dmd"
-      }
-      cd ../druntime
-      make -j$NIX_BUILD_CORES -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD
-      cd ../phobos
-      make -j$NIX_BUILD_CORES -f posix.mak PIC=${usePIC} INSTALL_DIR=$out DMD=$DMD
-      cd ..
-  '';
+        substituteInPlace ${datetimePath} \
+            --replace "tzName == \"leapseconds\"" "baseName(tzName) == \"leapseconds\""
 
-  # disable check phase because some tests are not working with sandboxing
-  doCheck = false;
+        # Ugly hack to fix the hardcoded path to zoneinfo in the source file.
+        # https://issues.dlang.org/show_bug.cgi?id=15391
+        substituteInPlace ${datetimePath} \
+            --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/
 
-  checkPhase = ''
-      cd dmd
-      ${
-          let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
-          osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in
-          "export DMD=$PWD/generated/${osname}/release/${bits}/dmd"
-      }
-      make -j$NIX_BUILD_CORES -C test -f Makefile PIC=${usePIC} DMD=$DMD BUILD=release SHARED=0
-      cd ../druntime
-      make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release
-      cd ../phobos
-      make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=${usePIC} DMD=$DMD BUILD=release
-      cd ..
-  '';
+        # Ugly hack so the dlopen call has a chance to succeed.
+        # https://issues.dlang.org/show_bug.cgi?id=15391
+        substituteInPlace phobos/std/net/curl.d \
+            --replace libcurl.so ${curl.out}/lib/libcurl.so
+
+        # phobos uses curl, so we need to patch the path to the lib.
+        substituteInPlace phobos/posix.mak \
+            --replace "-soname=libcurl.so.4" "-soname=${curl.out}/lib/libcurl.so.4"
+
+    ''
+
+    + stdenv.lib.optionalString (bootstrapVersion) ''
+        substituteInPlace ${datetimePath} \
+            --replace "import std.traits;" "import std.traits;import std.path;"
+
+        substituteInPlace ${datetimePath} \
+            --replace "tzName == \"+VERSION\"" "baseName(tzName) == \"leapseconds\" || tzName == \"+VERSION\""
+    ''
+
+    + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
+        # See https://github.com/NixOS/nixpkgs/issues/29443
+        substituteInPlace phobos/std/path.d \
+            --replace "\"/root" "\"${ROOT_HOME_DIR}"
+    '';
+
+    dmdPath = if bootstrapVersion then
+      "dmd/src"
+    else
+      "dmd";
+
+    postPatch = ''
+        # Use proper C++ compiler
+        substituteInPlace ${dmdPath}/posix.mak \
+            --replace g++ $CXX
+
+        # TODO
+        substituteInPlace druntime/src/core/memory.d \
+            --replace "assert(z is null);" "//assert(z is null);"
+    ''
+
+    + stdenv.lib.optionalString (!bootstrapVersion) ''
+        substituteInPlace druntime/test/common.mak \
+            --replace "DFLAGS:=" "DFLAGS:=${usePIC} "
+    ''
+
+    + phobosPatches
+
+    + stdenv.lib.optionalString (stdenv.hostPlatform.isLinux && bootstrapVersion) ''
+      substituteInPlace ${dmdPath}/root/port.c \
+        --replace "#include <bits/mathdef.h>" "#include <complex.h>"
+    ''
+
+    + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+        substituteInPlace ${dmdPath}/posix.mak \
+            --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_
+    ''
+
+    + stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin && bootstrapVersion) ''
+	# Was not able to compile on darwin due to "__inline_isnanl"
+	# being undefined.
+	substituteInPlace ${dmdPath}/root/port.c --replace __inline_isnanl __inline_isnan
+    '';
+
+    nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which gdb ]
+
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
+      Foundation
+    ]);
+
+    buildInputs = [ curl tzdata ];
+
+    bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
+    osname = if stdenv.hostPlatform.isDarwin then
+      "osx"
+    else
+      stdenv.hostPlatform.parsed.kernel.name;
+    top = "$(echo $NIX_BUILD_TOP)";
+    pathToDmd = if bootstrapVersion then
+      "${top}/dmd/src/dmd"
+    else
+      "${top}/dmd/generated/${osname}/release/${bits}/dmd";
+
+    # Buid and install are based on http://wiki.dlang.org/Building_DMD
+    buildPhase = ''
+        cd dmd
+        make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out
+        cd ../druntime
+        make -j$NIX_BUILD_CORES -f posix.mak PIC=1 INSTALL_DIR=$out DMD=${pathToDmd}
+        cd ../phobos
+        make -j$NIX_BUILD_CORES -f posix.mak PIC=1 INSTALL_DIR=$out DMD=${pathToDmd}
+        cd ..
+    '';
+
+    doCheck = !bootstrapVersion;
+
+    checkPhase = ''
+        cd dmd
+        make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 DMD=${pathToDmd} BUILD=release SHARED=0 SHELL=$SHELL
+        cd ../druntime
+        make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release
+        cd ..
+    '';
+    
+    extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}";
+
+    installPhase = ''
+        cd dmd
+        mkdir $out
+        mkdir $out/bin
+        cp ${pathToDmd} $out/bin
+
+        mkdir -p $out/share/man/man1
+        mkdir -p $out/share/man/man5
+        cp -r docs/man/man1/* $out/share/man/man1/
+        cp -r docs/man/man5/* $out/share/man/man5/
+
+        cd ../druntime
+        mkdir $out/include
+        mkdir $out/include/d2
+        cp -r import/* $out/include/d2
+
+        cd ../phobos
+        mkdir $out/lib
+        cp generated/${osname}/release/${bits}/libphobos2.${extension} $out/lib
+
+        cp -r std $out/include/d2
+        cp -r etc $out/include/d2
+
+        wrapProgram $out/bin/dmd \
+            --prefix PATH ":" "${stdenv.cc}/bin" \
+            --set-default CC "$CC"
+
+        cd $out/bin
+        tee dmd.conf << EOF
+        [Environment]
+        DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--export-dynamic"} -fPIC
+        EOF
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Official reference compiler for the D language";
+      homepage = http://dlang.org/;
+      # Everything is now Boost licensed, even the backend.
+      # https://github.com/dlang/dmd/pull/6680
+      license = licenses.boost;
+      maintainers = with maintainers; [ ThomasMader ];
+      platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+    };
+  };
+
+  # Need to test Phobos in a fixed-output derivation, otherwise the
+  # network stuff in Phobos would fail if sandbox mode is enabled.
+  phobosUnittests = stdenv.mkDerivation rec {
+    name = "phobosUnittests-${version}";
+    version = dmdBuild.version;
+
+    enableParallelBuilding = dmdBuild.enableParallelBuilding;
+    preferLocalBuild = true;
+    inputString = dmdBuild.outPath;
+    outputHashAlgo = "sha256";
+    outputHash = builtins.hashString "sha256" inputString;
+
+    srcs = dmdBuild.srcs;
+
+    sourceRoot = ".";
+
+    postPatch = dmdBuild.phobosPatches;
+
+    nativeBuildInputs = dmdBuild.nativeBuildInputs;
+    buildInputs = dmdBuild.buildInputs;
+
+    buildPhase = ''
+        cd phobos
+        make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${dmdBuild}/bin/dmd BUILD=release
+    '';
+
+    installPhase = ''
+        echo -n $inputString > $out
+    '';
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  inherit phobosUnittests;
+  name = "dmd-${version}";
+  phases = "installPhase";
 
   installPhase = ''
-      cd dmd
-      mkdir $out
-      mkdir $out/bin
-      ${
-          let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
-          osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in
-          "cp $PWD/generated/${osname}/release/${bits}/dmd $out/bin"
-      }
-
-      mkdir -p $out/share/man/man1
-      mkdir -p $out/share/man/man5
-      cp -r docs/man/man1/* $out/share/man/man1/
-      cp -r docs/man/man5/* $out/share/man/man5/
-
-      cd ../druntime
-      mkdir $out/include
-      mkdir $out/include/d2
-      cp -r import/* $out/include/d2
-
-      cd ../phobos
-      mkdir $out/lib
-      ${
-          let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
-          osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name;
-          extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}"; in
-          "cp generated/${osname}/release/${bits}/libphobos2.${extension} $out/lib"
-      }
-
-      cp -r std $out/include/d2
-      cp -r etc $out/include/d2
-
-      wrapProgram $out/bin/dmd \
-          --prefix PATH ":" "${stdenv.cc}/bin" \
-          --set-default CC "$CC"
-
-      cd $out/bin
-      tee dmd.conf << EOF
-      [Environment]
-      DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--export-dynamic"} -fPIC
-      EOF
+    mkdir $out
+    cp -r --symbolic-link ${dmdBuild}/* $out/
   '';
-
-  meta = with stdenv.lib; {
-    description = "Official reference compiler for the D language";
-    homepage = http://dlang.org/;
-    # Everything is now Boost licensed, even the backend.
-    # https://github.com/dlang/dmd/pull/6680
-    license = licenses.boost;
-    maintainers = with maintainers; [ ThomasMader ];
-    platforms = platforms.unix;
-  };
 }
+
diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
index af1db1e6dcc..51274dd6059 100644
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal";
   };
 
-  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 (stdenv.lib.getBin hscolour) ];
+  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
 
   patches = [ ./relocation.patch ];
 
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 22a1016776e..d573a22e0ae 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     ./relocation.patch
   ];
 
-  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 (stdenv.lib.getBin hscolour) ];
+  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 55193f2f3c3..d475e3438b4 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch
     ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch;
 
-  buildInputs = [ ghc perl (stdenv.lib.getBin hscolour) sphinx ];
+  buildInputs = [ ghc perl hscolour sphinx ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix
index 7c3b21f33c2..bcc801c98ea 100644
--- a/pkgs/development/compilers/ghc/8.2.1.nix
+++ b/pkgs/development/compilers/ghc/8.2.1.nix
@@ -10,7 +10,7 @@
 let
   inherit (bootPkgs) ghc;
   version = "8.2.1";
-  preReleaseName = "ghc-8.2.1";
+
   commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ];
   commonPreConfigure =  ''
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 27f706fc1c6..92ba3f6a46e 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -11,7 +11,7 @@
 let
   inherit (bootPkgs) ghc;
 
-  commonBuildInputs = [ ghc perl autoconf automake (stdenv.lib.getBin happy) (stdenv.lib.getBin alex) python3 ];
+  commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
   rev = "14457cf6a50f708eecece8f286f08687791d51f7";
 
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index c7d5b7a742b..d4418b058d9 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -113,7 +113,7 @@ in mkDerivation (rec {
     lens optparse-applicative parallel safe shelly split
     stringsearch syb system-fileio system-filepath tar terminfo text-binary
     unordered-containers vector wl-pprint-text yaml
-    (stdenv.lib.getBin alex) (stdenv.lib.getBin happy) git gnumake autoconf automake libtool patch gmp
+    alex happy git gnumake autoconf automake libtool patch gmp
     base16-bytestring cryptohash executable-path haddock-api
     transformers-compat QuickCheck haddock hspec xhtml
     regex-posix libiconv
diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix
index 7547a8ebbc6..0c4cef653d8 100644
--- a/pkgs/development/compilers/halvm/2.4.0.nix
+++ b/pkgs/development/compilers/halvm/2.4.0.nix
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
     sed -ie 's|ld |${targetPackages.stdenv.cc.bintools}/bin/ld |g' src/scripts/ldkernel.in
   '';
   configureFlags = stdenv.lib.optional (!enableIntegerSimple) [ "--enable-gmp" ];
-  propagatedNativeBuildInputs = [ (stdenv.lib.getBin alex) (stdenv.lib.getBin happy) ];
+  propagatedNativeBuildInputs = [ alex happy ];
   buildInputs =
-   let haskellPkgs = [ (stdenv.lib.getBin alex) (stdenv.lib.getBin happy) (stdenv.lib.getBin bootPkgs.hscolour) bootPkgs.cabal-install bootPkgs.haddock bootPkgs.hpc
+   let haskellPkgs = [ alex happy bootPkgs.hscolour bootPkgs.cabal-install bootPkgs.haddock bootPkgs.hpc
     ]; in [ bootPkgs.ghc
             automake perl git targetPackages.stdenv.cc.bintools
             autoconf xen zlib ncurses.dev
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index 5c283dd4380..154da0707f6 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -1,103 +1,258 @@
-{ stdenv, fetchFromGitHub, cmake, llvm, dmd, curl, tzdata, python,
-  lit, gdb, unzip, darwin }:
+{ stdenv, fetchgit, fetchurl, cmake, llvm, curl, tzdata
+, python, libconfig, lit, gdb, unzip, darwin, bash
+, callPackage
+, bootstrapVersion ? false
+, version ? "1.5.0"
+, ldcSha256 ? "1150sgns03vplni2wd4afk3rgw3rap8rsiipspw0rzxgki5rlr83"
+}:
+
+let
+
+  bootstrapLdc = if !bootstrapVersion then
+    # LDC 0.17.x is the last version which doesn't need a working D compiler to
+    # build so we use that version to bootstrap the actual build.
+    callPackage ./default.nix {
+      bootstrapVersion = true;
+      version = "0.17.5";
+      ldcSha256 = "0200r5y8hs5yv2cx24csgyh00dlg18877b9cfblixypr6nhl19bs";
+    }
+  else
+    "";
+
+  ldcBuild = stdenv.mkDerivation rec {
+    name = "ldcBuild-${version}";
+
+    enableParallelBuilding = true;
+
+    src = fetchurl {
+      url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz";
+      sha256 = ldcSha256;
+    };
+
+    sourceRoot = ".";
+
+    postUnpack = ''
+        cd ldc-${version}-src/
+
+        patchShebangs .
+
+        # Remove cppa test for now because it doesn't work.
+        rm tests/d2/dmd-testsuite/runnable/cppa.d
+        rm tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp
+    ''
+
+    + stdenv.lib.optionalString (bootstrapVersion) ''
+        # ... runnable/variadic.d            ()
+        #Test failed.  The logged output:
+        #/tmp/nix-build-ldcBuild-0.17.5.drv-0/ldc-0.17.5-src/build/bin/ldmd2 -conf= -m64 -Irunnable   -od/tmp/nix-build-ldcBuild-0.17.5.drv-0/ldc-0.17.5-src/build/dmd-testsuite/runnable -of/tmp/nix-build-ldcBuild-0.17.5.drv-0/ldc-0.17.5-src/build/dmd-testsuite/runnable/variadic_0 runnable/variadic.d
+        #Error: integer constant expression expected instead of <cant>
+        #Error: integer constant expression expected instead of <cant>
+        #Error: integer constant expression expected instead of <cant>
+        #Error: integer constant expression expected instead of <cant>
+        #Error: integer constant expression expected instead of <cant>
+        #runnable/variadic.d(84): Error: template instance variadic.Foo3!(int, int, int) error instantiating
+        #
+        #
+        #==============================
+        #Test failed: expected rc == 0, exited with rc == 1
+        rm tests/d2/dmd-testsuite/runnable/variadic.d
+    ''
+
+    + stdenv.lib.optionalString (!bootstrapVersion) ''
+        # https://github.com/NixOS/nixpkgs/issues/29611
+        rm tests/sanitizers/asan_*
+    '';
+
+    ROOT_HOME_DIR = "$(echo ~root)";
+
+    datetimePath = if bootstrapVersion then
+      "phobos/std/datetime.d"
+    else
+      "phobos/std/datetime/timezone.d";
+
+    postPatch = ''
+        substituteInPlace cmake/Modules/FindLLVM.cmake \
+            --replace "llvm_set(LIBRARY_DIRS" "#llvm_set(LIBRARY_DIRS"
+
+        substituteInPlace runtime/${datetimePath} \
+            --replace "import core.time;" "import core.time;import std.path;"
+
+        substituteInPlace runtime/${datetimePath} \
+            --replace "tzName == \"leapseconds\"" "baseName(tzName) == \"leapseconds\""
+
+        substituteInPlace runtime/phobos/std/net/curl.d \
+            --replace libcurl.so ${curl.out}/lib/libcurl.so
+
+        # Ugly hack to fix the hardcoded path to zoneinfo in the source file.
+        # https://issues.dlang.org/show_bug.cgi?id=15391
+        substituteInPlace runtime/${datetimePath} \
+            --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/
+
+        substituteInPlace tests/d2/dmd-testsuite/Makefile \
+            --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash"
+    ''
+
+    + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
+        # See https://github.com/NixOS/nixpkgs/issues/29443
+        substituteInPlace runtime/phobos/std/path.d \
+            --replace "\"/root" "\"${ROOT_HOME_DIR}"
+
+        # TODO
+        substituteInPlace runtime/druntime/src/core/memory.d \
+            --replace "assert(z is null);" "//assert(z is null);"
+    ''
+
+    + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) ''
+        # https://github.com/ldc-developers/ldc/pull/2306
+        # Can be removed on bootstrap version > 0.17.5
+        substituteInPlace gen/programs.cpp \
+            --replace "gcc" "clang"
+
+	# Was not able to compile on darwin due to "__inline_isnanl"
+	# being undefined.
+	substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan
+    ''
+
+    + stdenv.lib.optionalString (stdenv.hostPlatform.isLinux && bootstrapVersion) ''
+      substituteInPlace dmd2/root/port.c \
+        --replace "#include <bits/mathdef.h>" "#include <complex.h>"
+    ''
+
+    + stdenv.lib.optionalString (bootstrapVersion) ''
+        substituteInPlace runtime/${datetimePath} \
+            --replace "import std.traits;" "import std.traits;import std.path;"
+
+        substituteInPlace runtime/${datetimePath} \
+            --replace "tzName == \"+VERSION\"" "baseName(tzName) == \"leapseconds\" || tzName == \"+VERSION\""
+    '';
+
+    nativeBuildInputs = [ cmake llvm bootstrapLdc python lit gdb unzip ]
+
+    ++ stdenv.lib.optional (bootstrapVersion) [
+      libconfig
+    ]
+
+    ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
+      Foundation
+    ]);
+
+
+    buildInputs = [ curl tzdata stdenv.cc ];
+
+    preConfigure = ''
+      cmakeFlagsArray=("-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc"
+                       "-DCMAKE_BUILD_TYPE=Release"
+                       "-DCMAKE_SKIP_RPATH=ON"
+                       "-DBUILD_SHARED_LIBS=OFF"
+                       "-DLDC_WITH_LLD=OFF"
+                       # Xcode 9.0.1 fixes that bug according to ldc release notes
+                       "-DRT_ARCHIVE_WITH_LDC=OFF"
+                       "-DLLVM_LIBRARY_DIRS=${llvm}/lib"
+                      )
+    '';
+
+
+    postConfigure = ''
+      export DMD=$PWD/bin/ldmd2
+    '';
+
+    makeFlags = [ "DMD=$DMD" ];
+
+    doCheck = true;
+
+    checkPhase = ''
+	# Build and run LDC D unittests.
+	ctest --output-on-failure -R "ldc2-unittest"
+	# Run LIT testsuite.
+	ctest -V -R "lit-tests"
+	# Run DMD testsuite.
+	DMD_TESTSUITE_MAKE_ARGS=-j$NIX_BUILD_CORES ctest -V -R "dmd-testsuite"
+    '';
+
+    meta = with stdenv.lib; {
+      description = "The LLVM-based D compiler";
+      homepage = https://github.com/ldc-developers/ldc;
+      # from https://github.com/ldc-developers/ldc/blob/master/LICENSE
+      license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
+      maintainers = with maintainers; [ ThomasMader ];
+      platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+    };
+  };
+
+  # Need to test Phobos in a fixed-output derivation, otherwise the
+  # network stuff in Phobos would fail if sandbox mode is enabled.
+  ldcUnittests = stdenv.mkDerivation rec {
+    name = "ldcUnittests-${version}";
+
+    enableParallelBuilding = ldcBuild.enableParallelBuilding;
+    preferLocalBuild = true;
+    inputString = ldcBuild.outPath;
+    outputHashAlgo = "sha256";
+    outputHash = builtins.hashString "sha256" inputString;
+
+    src = ldcBuild.src;
+
+    sourceRoot = ".";
+
+    postUnpack = ldcBuild.postUnpack;
+
+    postPatch = ldcBuild.postPatch;
+
+    nativeBuildInputs = ldcBuild.nativeBuildInputs
+
+    ++ [
+      ldcBuild
+    ];
+
+    buildInputs = ldcBuild.buildInputs;
+
+    preConfigure = ''
+      cmakeFlagsArray=( "-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc"
+                        "-DCMAKE_BUILD_TYPE=Release"
+                        "-DCMAKE_SKIP_RPATH=ON"
+                        "-DBUILD_SHARED_LIBS=OFF"
+                        "-DLDC_WITH_LLD=OFF"
+                        # Xcode 9.0.1 fixes that bug according to ldc release notes
+                        "-DRT_ARCHIVE_WITH_LDC=OFF"
+                        "-DLLVM_LIBRARY_DIRS=${llvm}/lib"
+                        "-DD_COMPILER=${ldcBuild}/bin/ldmd2"
+                      )
+    '';
+
+    postConfigure = ldcBuild.postConfigure;
+
+    makeFlags = ldcBuild.makeFlags;
+
+    buildCmd = if bootstrapVersion then
+      "ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\""
+    else
+      "make -j$NIX_BUILD_CORES DMD=${ldcBuild}/bin/ldc2 druntime-test-runner druntime-test-runner-debug phobos2-test-runner phobos2-test-runner-debug";
+
+    testCmd = if bootstrapVersion then
+      "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\""
+    else
+      "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest\"";
+
+    buildPhase = ''
+        ${buildCmd}
+        ${testCmd}
+    '';
+
+    installPhase = ''
+        echo -n $inputString > $out
+    '';
+  };
+
+in
 
 stdenv.mkDerivation rec {
+  inherit ldcUnittests;
   name = "ldc-${version}";
-  version = "1.3.0";
+  phases = "installPhase";
 
-  srcs = [
-  (fetchFromGitHub {
-    owner = "ldc-developers";
-    repo = "ldc";
-    rev = "v${version}";
-    sha256 = "1ac3j4cwwgjpayhijxx4d6478bc3iqksjxkd7xp7byx7k8w1ppdl";
-    name = "ldc-v${version}-src";
-  })
-  (fetchFromGitHub {
-    owner = "ldc-developers";
-    repo = "druntime";
-    rev = "ldc-v${version}";
-    sha256 = "1m13370wnj3sizqk3sdpzi9am5d24srf27d613qblhqa9n8vwz30";
-    name = "druntime-ldc-v${version}-src";
-  })
-  (fetchFromGitHub {
-    owner = "ldc-developers";
-    repo = "phobos";
-    rev = "ldc-v${version}";
-    sha256 = "0fhcdfi7a00plwj27ysfyv783nhk0kspq7hawf6vbsl3s1nyvn8g";
-    name = "phobos-ldc-v${version}-src";
-  })
-  (fetchFromGitHub {
-    owner = "ldc-developers";
-    repo = "dmd-testsuite";
-    rev = "ldc-v${version}";
-    sha256 = "0dmdkp220gqhxjrmrjfkf0vsvylwfaj70hswavq4q3v4dg17pzmj";
-    name = "dmd-testsuite-ldc-v${version}-src";
-  })
-  ];
-
-  sourceRoot = ".";
-
-  postUnpack = ''
-      mv ldc-v${version}-src/* .
-
-      mv druntime-ldc-v${version}-src/* runtime/druntime
-
-      mv phobos-ldc-v${version}-src/* runtime/phobos
-
-      mv dmd-testsuite-ldc-v${version}-src/* tests/d2/dmd-testsuite
-
-      # Remove cppa test for now because it doesn't work.
-      rm tests/d2/dmd-testsuite/runnable/cppa.d
-      rm tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp
+  installPhase = ''
+    mkdir $out
+    cp -r --symbolic-link ${ldcBuild}/* $out/
   '';
-
-  postPatch = ''
-      substituteInPlace runtime/phobos/std/net/curl.d \
-          --replace libcurl.so ${curl.out}/lib/libcurl.so
-
-      # Ugly hack to fix the hardcoded path to zoneinfo in the source file.
-      # https://issues.dlang.org/show_bug.cgi?id=15391
-      substituteInPlace runtime/phobos/std/datetime.d \
-          --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/
-  ''
-
-  + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace driver/tool.cpp \
-          --replace "gcc" "clang"
-  '';
-
-  nativeBuildInputs = [ cmake llvm dmd python lit gdb unzip ]
-
-  ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
-    Foundation
-  ]);
-
-  buildInputs = [ curl tzdata stdenv.cc ];
-
-  preConfigure = ''
-    cmakeFlagsArray=("-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc")
-  '';
-
-  postConfigure = ''
-    export DMD=$PWD/bin/ldc2
-  '';
-
-  makeFlags = [ "DMD=$DMD" ];
-
-  # disable check phase because some tests are not working with sandboxing
-  doCheck = false;
-
-  checkPhase = ''
-      ctest -j $NIX_BUILD_CORES -V DMD=$DMD
-  '';
-
-  meta = with stdenv.lib; {
-    description = "The LLVM-based D compiler";
-    homepage = https://github.com/ldc-developers/ldc;
-    # from https://github.com/ldc-developers/ldc/blob/master/LICENSE
-    license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
-    maintainers = with maintainers; [ ThomasMader ];
-    platforms = platforms.unix;
-  };
 }
+
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8c9cea0579f..84df4d1f0c4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -897,7 +897,6 @@ self: super: {
   # Don't install internal mkReadme tool.
   hastache = overrideCabal super.hastache (drv: {
     doCheck = false;
-    enableSeparateBinOutput = false;
     postInstall = "rm $out/bin/mkReadme && rmdir $out/bin";
   });
 
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index d5a2652a4b7..8146674a943 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -217,10 +217,7 @@ self: super: builtins.intersectAttrs super {
 
   # wxc supports wxGTX >= 3.0, but our current default version points to 2.8.
   # http://hydra.cryp.to/build/1331287/log/raw
-  wxc = (overrideCabal super.wxc (drv: {
-      buildDepends = (drv.buildDepends or []) ++ [self.split];
-      postInstall = "cp -v dist/build/libwxc.so.0.92.3.0 $lib/lib/libwxc.so";
-    })).override { wxGTK = pkgs.wxGTK30; };
+  wxc = (addBuildDepend super.wxc self.split).override { wxGTK = pkgs.wxGTK30; };
   wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; };
 
   # Test suite wants to connect to $DISPLAY.
@@ -510,52 +507,4 @@ self: super: builtins.intersectAttrs super {
   # Break cyclic reference that results in an infinite recursion.
   partial-semigroup = dontCheck super.partial-semigroup;
 
-  # Alex has some weird files in /usr/share that create a cyclic ref with
-  # its bin dir.
-  alex = hasNoBinOutput super.alex;
-
-  # Disable separate bin outputs for these specific packages that break with it.
-  H = hasNoBinOutput super.H;
-  cryptol = hasNoBinOutput super.cryptol;
-  hscolour = hasNoBinOutput super.hscolour;
-  sproxy = hasNoBinOutput super.sproxy;
-  sproxy2 = hasNoBinOutput super.sproxy2;
-  sproxy-web = hasNoBinOutput super.sproxy-web;
-  juandelacosa = hasNoBinOutput super.juandelacosa;
-  mywatch = hasNoBinOutput super.mywatch;
-  sugarhaskell = hasNoBinOutput super.sugarhaskell;
-  zerobin = hasNoBinOutput super.zerobin;
-
-  git-annex = overrideCabal super.git-annex (drv: {
-    enableSeparateBinOutput = false;
-    enableSeparateEtcOutput = false;
-  });
-
-  # Has extra data files which are referred to from the binary output,
-  # creating a store reference cycle. Putting data in separate output
-  # solves the problem.
-  happy = overrideCabal super.happy (drv: { enableSeparateDataOutput = true; });
-
-  # Override a number of packages with specific references to $out in their
-  # derivations
-  stack = overrideCabal super.stack (drv: {
-    postInstall = ''
-      exe=$bin/bin/stack
-      mkdir -p $bin/share/bash-completion/completions
-      $exe --bash-completion-script $exe >$bin/share/bash-completion/completions/stack
-    '';
-  });
-  Agda = overrideCabal super.Agda (drv: {
-    postInstall = ''
-      files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
-      for f in "''${files[@]}" ; do
-        $bin/bin/agda $f
-      done
-      for f in "''${files[@]}" ; do
-        $bin/bin/agda -c --no-main $f
-      done
-      $bin/bin/agda-mode compile
-    '';
-  });
-
 }
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index aafc1b63530..3e82003be43 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -56,10 +56,6 @@ let isCross = (ghc.cross or null) != null; in
 , hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all"
 , enableSeparateDataOutput ? false
 , enableSeparateDocOutput ? doHaddock
-, enableSeparateBinOutput ? isExecutable
-, outputsToInstall ? []
-, enableSeparateLibOutput ? true
-, enableSeparateEtcOutput ? (stdenv.lib.versionOlder "7.7" ghc.version)
 } @ args:
 
 assert editedCabalFile != null -> revision != null;
@@ -83,6 +79,9 @@ let
                         then "package-db"
                         else "package-conf";
 
+  # the target dir for haddock documentation
+  docdir = docoutput: docoutput + "/share/doc";
+
   newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
   newCabalFile = fetchurl {
     url = newCabalFileUrl;
@@ -96,13 +95,6 @@ let
                    '';
 
   hasActiveLibrary = isLibrary && (enableStaticLibraries || enableSharedLibraries || enableLibraryProfiling);
-  hasLibOutput = enableSeparateLibOutput && hasActiveLibrary;
-  libDir = if hasLibOutput then "$lib/lib/${ghc.name}" else "$out/lib/${ghc.name}";
-  binDir = if enableSeparateBinOutput then "$bin/bin" else "$out/bin";
-  libexecDir = if enableSeparateBinOutput then "$libexec/bin" else "$out/libexec";
-  etcDir = if enableSeparateEtcOutput then "$etc/etc" else "$out/etc";
-  docDir = if enableSeparateDocOutput then "$doc/share/doc" else "$out/share/doc";
-  dataDir = if enableSeparateDataOutput then "$data/share/${ghc.name}" else "$out/share/${ghc.name}";
 
   # We cannot enable -j<n> parallelism for libraries because GHC is far more
   # likely to generate a non-determistic library ID in that case. Further
@@ -121,20 +113,12 @@ let
     stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);
 
   defaultConfigureFlags = [
-    "--verbose" "--prefix=$out"
-    # Binary directory has to be $bin/bin instead of just $bin: this
-    # is so that the package is added to the PATH when it's used as a
-    # build input. Sadly mkDerivation won't add inputs that don't have
-    # bin subdirectory.
-    "--bindir=${binDir}"
-    "--libdir=${libDir}" "--libsubdir=\\$pkgid"
-    "--libexecdir=${libexecDir}"
-    (optionalString (enableSeparateEtcOutput) "--sysconfdir=${etcDir}") # Old versions of cabal don't support this flag.
-    "--datadir=${dataDir}"
-    "--docdir=${docDir}"
+    "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
+    (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}")
+    (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}")
     "--with-gcc=$CC" # Clang won't work without that extra information.
     "--package-db=$packageConfDir"
-    (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=${libDir}/${pname}-${version}")
+    (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}")
     (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
     (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES")
     (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
@@ -168,11 +152,8 @@ let
   allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
                         optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
 
-  nativeBuildInputs = map stdenv.lib.getBin
-    ( optional (allPkgconfigDepends != []) pkgconfig
-      ++ buildTools ++ libraryToolDepends ++ executableToolDepends
-      ++ [ removeReferencesTo ]
-    );
+  nativeBuildInputs = optional (allPkgconfigDepends != []) pkgconfig ++
+                      buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ];
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
   otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      optionals (allPkgconfigDepends != []) allPkgconfigDepends ++
@@ -201,15 +182,7 @@ assert allPkgconfigDepends != [] -> pkgconfig != null;
 stdenv.mkDerivation ({
   name = "${pname}-${version}";
 
-  outputs = if (args ? outputs) then args.outputs else
-    (  (optional enableSeparateBinOutput "bin")
-    ++ (optional enableSeparateBinOutput "libexec")
-    ++ [ "out" ]
-    ++ (optional enableSeparateDataOutput "data")
-    ++ (optional enableSeparateDocOutput "doc")
-    ++ (optional enableSeparateEtcOutput "etc")
-    ++ (optional hasLibOutput "lib")
-    );
+  outputs = if (args ? outputs) then args.outputs else ([ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc"));
   setOutputFlags = false;
 
   pos = builtins.unsafeGetAttrPos "pname" args;
@@ -233,7 +206,7 @@ stdenv.mkDerivation ({
 
   postPatch = optionalString jailbreak ''
     echo "Run jailbreak-cabal to lift version restrictions on build inputs."
-    ${stdenv.lib.getBin jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal
+    ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal
   '' + postPatch;
 
   setupCompilerEnvironmentPhase = ''
@@ -241,7 +214,7 @@ stdenv.mkDerivation ({
 
     echo "Build with ${ghc}."
     export PATH="${ghc}/bin:$PATH"
-    ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${stdenv.lib.getBin hscolour}/bin:$PATH"}
+    ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}
 
     packageConfDir="$TMPDIR/package.conf.d"
     mkdir -p $packageConfDir
@@ -268,7 +241,7 @@ stdenv.mkDerivation ({
     #
     # Create a local directory with symlinks of the *.dylib (macOS shared
     # libraries) from all the dependencies.
-    local dynamicLinksDir="${libDir}/links"
+    local dynamicLinksDir="$out/lib/links"
     mkdir -p $dynamicLinksDir
     for d in $(grep dynamic-library-dirs "$packageConfDir/"*|awk '{print $2}'); do
       ln -s "$d/"*.dylib $dynamicLinksDir
@@ -340,7 +313,7 @@ stdenv.mkDerivation ({
 
     ${if !hasActiveLibrary then "${setupCommand} install" else ''
       ${setupCommand} copy
-      local packageConfDir="${libDir}/package.conf.d"
+      local packageConfDir="$out/lib/${ghc.name}/package.conf.d"
       local packageConfFile="$packageConfDir/${pname}-${version}.conf"
       mkdir -p "$packageConfDir"
       ${setupCommand} register --gen-pkg-config=$packageConfFile
@@ -348,7 +321,7 @@ stdenv.mkDerivation ({
       mv $packageConfFile $packageConfDir/$pkgId.conf
     ''}
     ${optionalString isGhcjs ''
-      for exeDir in "${binDir}/"*.jsexe; do
+      for exeDir in "$out/bin/"*.jsexe; do
         exe="''${exeDir%.jsexe}"
         printWords '#!${nodejs}/bin/node' > "$exe"
         cat "$exeDir/all.js" >> "$exe"
@@ -357,68 +330,18 @@ stdenv.mkDerivation ({
     ''}
     ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"}
     ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
-      for exe in "${binDir}/"* ; do
-        install_name_tool -add_rpath "${libDir}/${pname}-${version}" "$exe"
+      for exe in "$out/bin/"* ; do
+        install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe"
       done
     ''}
 
     ${optionalString enableSeparateDocOutput ''
-    # Remove references back to $out but also back to $lib if we have
-    # docs. $lib is needed as it stores path to haddock interfaces in the
-    # conf file which creates a cycle if docs refer back to library
-    # path.
-    mkdir -p ${docDir}
-
-    for x in ${docDir}/html/src/*.html; do
-      remove-references-to -t $out -t ${libDir} -t ${binDir} ${optionalString enableSeparateDataOutput "-t $data"} $x
+    for x in ${docdir "$doc"}/html/src/*.html; do
+      remove-references-to -t $out $x
     done
+    mkdir -p $doc
     ''}
-
-    ${optionalString hasLibOutput ''
-    # Even if we don't have binary output for the package, things like
-    # Paths files will embed paths to bin/libexec directories in themselves
-    # which results in .lib <-> $out cyclic store reference. We
-    # therefore patch out the paths from separate library if we don't have
-    # separate bin output too.
-    #
-    # If we _do_ have separate bin and lib outputs, we may still be in
-    # trouble in case of shared executables: executable contains path to
-    # .lib, .lib contains path (through Paths) to .bin and we have a
-    # cycle.
-    #
-    # Lastly we have to deal with references from .lib back into
-    # $out/share if we're not splitting out data directory.
-    #
-    # It may happen that we have hasLibOutput set but the library
-    # directory was not created: this happens in the case that library
-    # section is not exposing any modules. See "fail" package for an
-    # example where no modules are exposed for GHC >= 8.0.
-    if [ -d ${libDir} ]; then
-      find ${libDir} -type f -exec \
-        remove-references-to -t ${binDir} -t ${libexecDir} "{}" \;
-    fi
-    ''}
-
-    ${optionalString (hasLibOutput && ! enableSeparateDocOutput) ''
-    # If we don't have separate docs, we have to patch out the ref to
-    # docs in package conf. This will likely break Haddock
-    # cross-package links but is necessary to break store cycle…
-    find ${libDir}/ -type f -name '*.conf' -exec \
-      remove-references-to -t ${docDir} "{}" \;
-    ''}
-
-    ${optionalString (hasLibOutput && ! enableSeparateDataOutput) ''
-    # Just like for doc output path in $out potentially landing in
-    # *.conf, we have to also remove the data directory so that it
-    # doesn't appear under data-dir field creating a cycle.
-    find ${libDir}/ -type f -exec echo Removing ${dataDir} refs from "{}" \;
-    find ${libDir}/ -type f -exec \
-      remove-references-to -t ${dataDir} "{}" \;
-    ''}
-
-    ${optionalString enableSeparateDataOutput "mkdir -p ${dataDir}"}
-    ${optionalString enableSeparateBinOutput "mkdir -p ${binDir} ${libexecDir}"}
-    ${optionalString enableSeparateEtcOutput "mkdir -p ${etcDir}"}
+    ${optionalString enableSeparateDataOutput "mkdir -p $data"}
 
     runHook postInstall
   '';
@@ -435,7 +358,7 @@ stdenv.mkDerivation ({
     # the directory containing the haddock documentation.
     # `null' if no haddock documentation was built.
     # TODO: fetch the self from the fixpoint instead
-    haddockDir = self: if doHaddock then "${docDir}/html" else null;
+    haddockDir = self: if doHaddock then "${docdir self.doc}/html" else null;
 
     env = stdenv.mkDerivation {
       name = "interactive-${pname}-${version}-environment";
@@ -463,7 +386,6 @@ stdenv.mkDerivation ({
          // optionalAttrs (description != "")  { inherit description; }
          // optionalAttrs (maintainers != [])  { inherit maintainers; }
          // optionalAttrs (hydraPlatforms != platforms) { inherit hydraPlatforms; }
-         // optionalAttrs (outputsToInstall != []) { inherit outputsToInstall; }
          ;
 
 }
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index b542a29c829..96520dce2b2 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -147,8 +147,4 @@ rec {
   overrideSrc = drv: { src, version ? drv.version }:
     overrideCabal drv (_: { inherit src version; editedCabalFile = null; });
 
-  hasNoBinOutput = drv: overrideCabal drv (drv: { enableSeparateBinOutput = false; });
-
-  installOutputs = drv: outputs: overrideCabal drv
-    (drv: { outputsToInstall = outputs; });
 }
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index cceaa360105..61043252155 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -44,7 +44,6 @@ let
       isLibrary = false;
       doHaddock = false;
       hyperlinkSource = false;      # Avoid depending on hscolour for this build.
-      enableSeparateEtcOutput = false; # The flag to support this is missing in old versions of cabal.
       postFixup = "rm -rf $out/lib $out/share $out/nix-support";
     });
     cpphs = overrideCabal (self.cpphs.overrideScope (self: super: {
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 1a12b2a65cd..ac484b3c112 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -43,7 +43,7 @@ let
   libDir        = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else "$out/lib/${ghcCommand}-${ghc.version}";
   docDir        = "$out/share/doc/ghc/html";
   packageCfgDir = "${libDir}/package.conf.d";
-  paths         = map lib.getLib (lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages));
+  paths         = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages);
   hasLibraries  = lib.any (x: x.isHaskellLibrary) paths;
   # CLang is needed on Darwin for -fllvm to work:
   # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html
diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix
index 26e754317df..54e2616e782 100644
--- a/pkgs/development/libraries/libp11/default.nix
+++ b/pkgs/development/libraries/libp11/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libp11-${version}";
-  version = "0.4.4";
+  version = "0.4.7";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "libp11";
     rev = name;
-    sha256 = "1jnpnwipmw3skw112qff36w046nyz5amiil228rn5divpkvx4axa";
+    sha256 = "0n1i0pxj6l0vdq8gpdwfp5p9qd7wkymg0lpy6a17ix8hpqsljlhr";
   };
 
   makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index c2cd5a01516..4d49fdce3a9 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -7,13 +7,11 @@
 assert readline != null;
 
 let
-  arch = if stdenv.isArm
-         then if stdenv.is64bit
-              then"arm64"
-              else "arm"
-         else if stdenv.is64bit
-              then"x64"
-              else "ia32";
+  arch = if stdenv.isx86_64 then "x64"
+            else if stdenv.isi686 then "ia32"
+            else if stdenv.isAarch64 then "arm64"
+            else if stdenv.isArm then "arm"
+            else throw "Unknown architecture for v8";
   git_url = "https://chromium.googlesource.com";
   clangFlag = if stdenv.isDarwin then "1" else "0";
   sharedFlag = if static then "static_library" else "shared_library";
@@ -172,6 +170,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null;
+
   # the `libv8_libplatform` target is _only_ built as a static library,
   # and is expected to be statically linked in when needed.
   # see the following link for further commentary:
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 14fcf145ddd..eb9cbc783da 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -175,13 +175,13 @@ let
         sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f";
       };
     };
-    "interpret-1.0.4" = {
+    "interpret-1.1.0" = {
       name = "interpret";
       packageName = "interpret";
-      version = "1.0.4";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz";
-        sha1 = "820cdd588b868ffb191a809506d6c9c8f212b1b0";
+        url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz";
+        sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614";
       };
     };
     "liftoff-2.3.0" = {
@@ -1300,13 +1300,13 @@ let
         sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f";
       };
     };
-    "array-slice-1.0.0" = {
+    "array-slice-1.1.0" = {
       name = "array-slice";
       packageName = "array-slice";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz";
-        sha1 = "e73034f00dcc1f40876008fd20feae77bd4b7c2f";
+        url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz";
+        sha512 = "3myjiz16qi117x0k52sisqyn0cqx6yxvpgr43bkil9shgs7yhs8wpdgd3wjwfzgwxsw330yqwhp880gsyx2kxj1lfyb6gs1fh7qqnh7";
       };
     };
     "for-own-1.0.0" = {
@@ -2119,13 +2119,13 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
-    "ajv-5.5.0" = {
+    "ajv-5.5.1" = {
       name = "ajv";
       packageName = "ajv";
-      version = "5.5.0";
+      version = "5.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-5.5.0.tgz";
-        sha1 = "eb2840746e9dc48bd5e063a36e3fd400c5eab5a9";
+        url = "https://registry.npmjs.org/ajv/-/ajv-5.5.1.tgz";
+        sha1 = "b38bb8876d9e86bee994956a04e721e88b248eb2";
       };
     };
     "har-schema-2.0.0" = {
@@ -4045,13 +4045,13 @@ let
         sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
       };
     };
-    "commander-2.12.1" = {
+    "commander-2.12.2" = {
       name = "commander";
       packageName = "commander";
-      version = "2.12.1";
+      version = "2.12.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.12.1.tgz";
-        sha512 = "36cb2mrf9piidjbqiz8krwx7r9hikgirjxzfrbyk3hd39xpmg489lia9d3cmzci80sx99428hg960sz9j5b72fn7pi928z5289ln8rw";
+        url = "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz";
+        sha512 = "007wb3baahjcrv17kgxryqjlsyr3c3kl2y07p85m4ia78pba9xyjr3cgi95jjrwq8qq550s78hj06f7z0ab8ssrxk6w06afjsmxln84";
       };
     };
     "is-my-json-valid-2.16.1" = {
@@ -4356,7 +4356,7 @@ in
           })
         ];
       })
-      sources."interpret-1.0.4"
+      sources."interpret-1.1.0"
       (sources."liftoff-2.3.0" // {
         dependencies = [
           sources."extend-3.0.1"
@@ -4518,7 +4518,7 @@ in
               (sources."object.defaults-1.1.0" // {
                 dependencies = [
                   sources."array-each-1.0.1"
-                  sources."array-slice-1.0.0"
+                  sources."array-slice-1.1.0"
                   (sources."for-own-1.0.0" // {
                     dependencies = [
                       sources."for-in-1.0.2"
@@ -4835,7 +4835,7 @@ in
           })
           (sources."har-validator-5.0.3" // {
             dependencies = [
-              (sources."ajv-5.5.0" // {
+              (sources."ajv-5.5.1" // {
                 dependencies = [
                   sources."co-4.6.0"
                   sources."fast-deep-equal-1.0.0"
@@ -6248,7 +6248,7 @@ in
                   sources."supports-color-2.0.0"
                 ];
               })
-              sources."commander-2.12.1"
+              sources."commander-2.12.2"
               (sources."is-my-json-valid-2.16.1" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 82416cf3b23..1f4cc61ce53 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -80,7 +80,10 @@
 , "sloc"
 , "smartdc"
 , "socket.io"
+, "stackdriver-statsd-backend"
 , "statsd"
+, "statsd-influxdb-backend"
+, "statsd-librato-backend"
 , "stylus"
 , "svgo"
 , "tern"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 021d4842279..af4480893c7 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1390,13 +1390,13 @@ let
         sha1 = "2721f05aa6876534cd30d6ded9418651cadfaa21";
       };
     };
-    "moment-2.19.2" = {
+    "moment-2.19.3" = {
       name = "moment";
       packageName = "moment";
-      version = "2.19.2";
+      version = "2.19.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.19.2.tgz";
-        sha512 = "2s41fkwslr6lp0v2yz37fmsbfiy98x8s1fjc6smx82sf8r6fiq9wyx61javlkn8agzn51zcanhfyxj4wvsc8wyrz5yilzy4ff4a7zj5";
+        url = "https://registry.npmjs.org/moment/-/moment-2.19.3.tgz";
+        sha1 = "bdb99d270d6d7fda78cc0fbace855e27fe7da69f";
       };
     };
     "ms-rest-2.2.7" = {
@@ -2020,13 +2020,13 @@ let
         sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
       };
     };
-    "@types/node-8.0.53" = {
+    "@types/node-8.0.54" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "8.0.53";
+      version = "8.0.54";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.0.53.tgz";
-        sha512 = "12x01f907cdv3cn1pm9jbxs65nm8i37l6g465qckym05jbzhzrjwiw4v6wz2qkssr8sl59h5lp894dgrash8x8hk6828yhqvklfd077";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.0.54.tgz";
+        sha512 = "33123ylzdg1ssnjwywg0zj0r3dc3bcxgql58pxhd4nd8g5a6drj73cizf4z7ddh44ckcwr6ily4p3mk33bjs4nipgyxqqpp7dslrsx9";
       };
     };
     "@types/request-2.0.8" = {
@@ -2101,6 +2101,15 @@ let
         sha512 = "1n2p6ca2m26hbf9gxlww91fp653cyqdbfnvxjc8jn91ybvbwbhsqg3cm4da8rrxzgfr9nsa6zpi20bv5w708753chaixbsym1v6qgl2";
       };
     };
+    "@types/events-1.1.0" = {
+      name = "_at_types_slash_events";
+      packageName = "@types/events";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/events/-/events-1.1.0.tgz";
+        sha512 = "27kr3kcspyk0am19v5qrmm66fvzggwk5pccanlkchgmns93m7785xw5cda8ff9yp78lbpd44b511rwbmfv8hvh6lhsflq5kr7vx2xnb";
+      };
+    };
     "@types/form-data-2.2.1" = {
       name = "_at_types_slash_form-data";
       packageName = "@types/form-data";
@@ -2308,13 +2317,13 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
-    "ajv-5.5.0" = {
+    "ajv-5.5.1" = {
       name = "ajv";
       packageName = "ajv";
-      version = "5.5.0";
+      version = "5.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-5.5.0.tgz";
-        sha1 = "eb2840746e9dc48bd5e063a36e3fd400c5eab5a9";
+        url = "https://registry.npmjs.org/ajv/-/ajv-5.5.1.tgz";
+        sha1 = "b38bb8876d9e86bee994956a04e721e88b248eb2";
       };
     };
     "har-schema-2.0.0" = {
@@ -2821,13 +2830,13 @@ let
         sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
       };
     };
-    "commander-2.12.1" = {
+    "commander-2.12.2" = {
       name = "commander";
       packageName = "commander";
-      version = "2.12.1";
+      version = "2.12.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.12.1.tgz";
-        sha512 = "36cb2mrf9piidjbqiz8krwx7r9hikgirjxzfrbyk3hd39xpmg489lia9d3cmzci80sx99428hg960sz9j5b72fn7pi928z5289ln8rw";
+        url = "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz";
+        sha512 = "007wb3baahjcrv17kgxryqjlsyr3c3kl2y07p85m4ia78pba9xyjr3cgi95jjrwq8qq550s78hj06f7z0ab8ssrxk6w06afjsmxln84";
       };
     };
     "is-my-json-valid-2.16.1" = {
@@ -3280,13 +3289,13 @@ let
         sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188";
       };
     };
-    "mime-db-1.31.0" = {
+    "mime-db-1.32.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.31.0";
+      version = "1.32.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.31.0.tgz";
-        sha512 = "1yvkd7sias7i24nvvbv8kj6sagzn758wclfky650vs38mhz0aq28bwcyg3y8nx13pa2fck3kdn5855cg62rxs3px8fj7l3rbkvg07d0";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.32.0.tgz";
+        sha512 = "1bl21q8acya2jj67757518bdy1yhc5d7ybn755wnikwcca3gq5akfg835nj5mp2kmd4f97yyy0qwx662jlwk1rgx7nl9qsd2vzsi5gr";
       };
     };
     "camelcase-keys-2.1.0" = {
@@ -4441,13 +4450,13 @@ let
         sha1 = "1b63be438a133e4b671cc1935197600175910d83";
       };
     };
-    "detective-4.6.0" = {
+    "detective-4.7.0" = {
       name = "detective";
       packageName = "detective";
-      version = "4.6.0";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/detective/-/detective-4.6.0.tgz";
-        sha512 = "1g05is493dwv51naw53l4jly2fr5xjawkkc859s2dsssgs9bjk99k401l3ms4fjkbnffv6z8s2wjx7mf3j05qvp28nidnb6mdda5yvf";
+        url = "https://registry.npmjs.org/detective/-/detective-4.7.0.tgz";
+        sha512 = "2mx76wpkjn1pabajhcwl4jz35kb1vqhwba3sl90xa625z6gr9cmc8graa5lm35h56arj84jk2gdw1bhsfcl3hwg098ilz2c8x46lq72";
       };
     };
     "stream-combiner2-1.1.1" = {
@@ -5737,13 +5746,13 @@ let
         sha1 = "58cccb244f563326ba893bf5c06a35f644846daa";
       };
     };
-    "k-rpc-socket-1.7.1" = {
+    "k-rpc-socket-1.7.2" = {
       name = "k-rpc-socket";
       packageName = "k-rpc-socket";
-      version = "1.7.1";
+      version = "1.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.1.tgz";
-        sha512 = "1xigw4j1na5gxiff1dad35vn0h91i77a9jzwsczl47rypanm2vfwyx2zchzdgny7mrxrn14bk9xss16nj2k3vng60v8pc7snjdc6q8n";
+        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.2.tgz";
+        sha512 = "02w1ih1lh86i5ap7c3dy2ml7g5a11r0w300iyxdf6v02qr0j1x3vf78hx5q9dgg3drifab018mgm851m457zzzi05i2z2r1s3zlflc3";
       };
     };
     "bencode-0.8.0" = {
@@ -7060,13 +7069,13 @@ let
         sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
       };
     };
-    "interpret-1.0.4" = {
+    "interpret-1.1.0" = {
       name = "interpret";
       packageName = "interpret";
-      version = "1.0.4";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz";
-        sha1 = "820cdd588b868ffb191a809506d6c9c8f212b1b0";
+        url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz";
+        sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614";
       };
     };
     "rechoir-0.6.2" = {
@@ -8585,6 +8594,15 @@ let
         sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779";
       };
     };
+    "extsprintf-1.4.0" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz";
+        sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f";
+      };
+    };
     "async-0.9.2" = {
       name = "async";
       packageName = "async";
@@ -9179,13 +9197,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.157.0" = {
+    "aws-sdk-2.162.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.157.0";
+      version = "2.162.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.157.0.tgz";
-        sha1 = "b55b16f8413dfa9e7323b60b21fce9743206f8a1";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.162.0.tgz";
+        sha1 = "1b16215fc9b599ba7cd2cfe7ce050c7f934381a6";
       };
     };
     "buffer-4.9.1" = {
@@ -9350,6 +9368,15 @@ let
         sha512 = "2xwfrbx7s959y63gdiy54y86mp770vkxfgszp5xhwnxr29d3xavf8dnp0ab238732wh1121qwlx6k68wa4wkk4rm4qiswq5h5m9fjhd";
       };
     };
+    "split-1.0.1" = {
+      name = "split";
+      packageName = "split";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
+        sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r";
+      };
+    };
     "supports-color-4.2.0" = {
       name = "supports-color";
       packageName = "supports-color";
@@ -10808,13 +10835,13 @@ let
         sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6";
       };
     };
-    "is-path-inside-1.0.0" = {
+    "is-path-inside-1.0.1" = {
       name = "is-path-inside";
       packageName = "is-path-inside";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz";
-        sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f";
+        url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz";
+        sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036";
       };
     };
     "cli-width-2.2.0" = {
@@ -11015,13 +11042,13 @@ let
         sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw";
       };
     };
-    "eslint-4.12.0" = {
+    "eslint-4.12.1" = {
       name = "eslint";
       packageName = "eslint";
-      version = "4.12.0";
+      version = "4.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-4.12.0.tgz";
-        sha512 = "31dhiy1b963gcs7s1ickygwm87vm943l5mhcxxwg97yc113b7fmdrzcb1m9gr9h0pkqacrdcmn59x3mdcqg0a4bgc2gjz859lszh6rs";
+        url = "https://registry.npmjs.org/eslint/-/eslint-4.12.1.tgz";
+        sha512 = "11x6bn4js0f82wyzpafz3yadbda9zb2bmz0mpwm0fdwv8i6f9gfc2syf6l2ppq70447nzmybcz9npvbiby34wkxwk8rydgyx1hlxj6v";
       };
     };
     "supports-color-3.2.3" = {
@@ -11474,13 +11501,13 @@ let
         sha1 = "d2d0f1887ca363d1acf0ea86d5c4df293b3fb675";
       };
     };
-    "simple-git-1.82.0" = {
+    "simple-git-1.84.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.82.0";
+      version = "1.84.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.82.0.tgz";
-        sha1 = "5fd0efe9c4ee78e5d942f276ac492b32e041a01a";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.84.0.tgz";
+        sha1 = "9283b2d4d4af1a8c2ccf25892b2f61e0ad5e8dfc";
       };
     };
     "tabtab-git+https://github.com/mixu/node-tabtab.git" = {
@@ -12384,13 +12411,13 @@ let
         sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f";
       };
     };
-    "array-slice-1.0.0" = {
+    "array-slice-1.1.0" = {
       name = "array-slice";
       packageName = "array-slice";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz";
-        sha1 = "e73034f00dcc1f40876008fd20feae77bd4b7c2f";
+        url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz";
+        sha512 = "3myjiz16qi117x0k52sisqyn0cqx6yxvpgr43bkil9shgs7yhs8wpdgd3wjwfzgwxsw330yqwhp880gsyx2kxj1lfyb6gs1fh7qqnh7";
       };
     };
     "for-own-1.0.0" = {
@@ -12690,13 +12717,13 @@ let
         sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c";
       };
     };
-    "eventemitter3-2.0.3" = {
+    "eventemitter3-3.0.0" = {
       name = "eventemitter3";
       packageName = "eventemitter3";
-      version = "2.0.3";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz";
-        sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba";
+        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.0.0.tgz";
+        sha512 = "0jijxlrlxb3vf5xqxibisd132qzlh9ag6ckxgvz791d4rqrzvzc2mzzn86jx1bgbsym1wi0pgm017i4rd5m84g1d38n56zqvh5g2r7b";
       };
     };
     "csslint-0.10.0" = {
@@ -12879,13 +12906,13 @@ let
         sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9";
       };
     };
-    "uglify-js-3.2.0" = {
+    "uglify-js-3.2.1" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.2.0";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.2.0.tgz";
-        sha512 = "2vgdxdcacmfv1079k2pbqi0cmgyg2xha1l1h91dnjb80wym2krmbq4i3kwk0ivknhj3mxm7iq584kx0rjyscz31cjkz38117fah7prg";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.2.1.tgz";
+        sha512 = "0rf96f9yqhh3vvkiv26h088xwpqs5sp5a7yd9cayxb9fdn997vg2jjh85fmii9c2w3kx3d3phf0mr38bxwxmw9rfaag8a4fz4j565h6";
       };
     };
     "xml-char-classes-1.0.0" = {
@@ -13077,13 +13104,13 @@ let
         sha1 = "2b19630af85b1666688b9d68f6e4218900f81f8c";
       };
     };
-    "tar-4.0.2" = {
+    "tar-4.1.1" = {
       name = "tar";
       packageName = "tar";
-      version = "4.0.2";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.0.2.tgz";
-        sha512 = "1mm9s6jly4lwfv9cak7kpiagqx3j6n1dh50k7nlnqy761ckfvn394asfgq1vdnxpjr164h5ybgcfysr8wgm70bwd0y3qnq4w3i8smg2";
+        url = "https://registry.npmjs.org/tar/-/tar-4.1.1.tgz";
+        sha512 = "3r6cs45gzrdin3x2fbdz9a3b8m5l7yn2f7kvnszf1k0vdfa4c06py7r904qj682v2rzh5c039hh65y3329hw1kg1dp4hf0122slnsd7";
       };
     };
     "tiny-lr-1.0.5" = {
@@ -13302,6 +13329,15 @@ let
         sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
       };
     };
+    "fs-minipass-1.2.3" = {
+      name = "fs-minipass";
+      packageName = "fs-minipass";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.3.tgz";
+        sha512 = "3jin38c3wsayawcxqs83qk9072fxypi41y16zhkak9l0fxsn92d4cgbw5s4rwaf69n9ix8sarpsychdhy3vi0nfghjj3y7if04lfnmv";
+      };
+    };
     "minipass-2.2.1" = {
       name = "minipass";
       packageName = "minipass";
@@ -13554,13 +13590,13 @@ let
         sha1 = "40d278beea417660a35dd9d3ee76511ffa911dcd";
       };
     };
-    "rxjs-5.5.2" = {
+    "rxjs-5.5.3" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "5.5.2";
+      version = "5.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz";
-        sha512 = "208dclsk809q1ra99l8j8xzrl9kcm4wpzwjb89rwdqrz78x3i0861kkgqi1sp3v8sdnnvdq0flmazdv96ah7jxpvwf74lw1llh2h5m1";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.3.tgz";
+        sha512 = "3ikrfz0plbcp9mi475mfmfpm2ar5dcihgm8g5vwvc1zlk5zypak2zh4gprsdrw8kgzn4dkmcqcakn5x27zw4yz6g7pn1ipv5j8iqsjm";
       };
     };
     "semaphore-async-await-1.5.1" = {
@@ -13752,13 +13788,13 @@ let
         sha1 = "e69e38a1babe969b0108207978b9f62b88604839";
       };
     };
-    "symbol-observable-1.0.4" = {
+    "symbol-observable-1.1.0" = {
       name = "symbol-observable";
       packageName = "symbol-observable";
-      version = "1.0.4";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz";
-        sha1 = "29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d";
+        url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz";
+        sha512 = "19pk4fk1ddq50all5c15bb58iwchzck5lvmsvlx5va17sfrq89pda0qrrnlma34m1kzay4q3k3ghmfp32hlqvk8njlfnhvavdvj42km";
       };
     };
     "vscode-uri-1.0.1" = {
@@ -14040,13 +14076,13 @@ let
         sha1 = "015db3f353e02e56377755f962742e8981e7bbba";
       };
     };
-    "boxen-1.2.2" = {
+    "boxen-1.3.0" = {
       name = "boxen";
       packageName = "boxen";
-      version = "1.2.2";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz";
-        sha1 = "3f1d4032c30ffea9d4b02c322eaf2ea741dcbce5";
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz";
+        sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc";
       };
     };
     "configstore-3.1.1" = {
@@ -14130,13 +14166,13 @@ let
         sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
       };
     };
-    "widest-line-1.0.0" = {
+    "widest-line-2.0.0" = {
       name = "widest-line";
       packageName = "widest-line";
-      version = "1.0.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
-        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
+        url = "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz";
+        sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273";
       };
     };
     "execa-0.7.0" = {
@@ -15714,15 +15750,6 @@ let
         sha1 = "1fc29af30b5edab76f54e229c411b0c663d0f9eb";
       };
     };
-    "split-1.0.1" = {
-      name = "split";
-      packageName = "split";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
-        sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r";
-      };
-    };
     "is-subset-0.1.1" = {
       name = "is-subset";
       packageName = "is-subset";
@@ -18819,13 +18846,13 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "snyk-1.51.0" = {
+    "snyk-1.53.0" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.51.0";
+      version = "1.53.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.51.0.tgz";
-        sha1 = "cba4d405d607f009dabada3fd62845f7283ce0b5";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.53.0.tgz";
+        sha1 = "3fdab4baa0cd70782137af53251c2259213e3c30";
       };
     };
     "spawn-please-0.3.0" = {
@@ -18918,13 +18945,13 @@ let
         sha512 = "3ar9rk77y39sydnriw6k9p5s15qpv1in81365l0yjbvn6qis7v4na98xfibsmfnnkjyblnd5qs2q1j6fabdfx4g2x5yi7ld6hdm6r3r";
       };
     };
-    "snyk-nuget-plugin-1.3.2" = {
+    "snyk-nuget-plugin-1.3.3" = {
       name = "snyk-nuget-plugin";
       packageName = "snyk-nuget-plugin";
-      version = "1.3.2";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.3.2.tgz";
-        sha512 = "0r929vp7mqx07wqr1k9xzww6yawkvf2c3s3cyx38mm65r72v8p16acis2y8ircl6spzh5slxv5adqpd70l7khw0fi8x4smjs812cgzp";
+        url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.3.3.tgz";
+        sha512 = "30z61ncsmlsk22d5sqy1vcc56lahvvy99bpr3iz1m532v6kq134xdqp0d19jsg4fspfg4kw2kc41f9ai4rnkqi0f1b57raa5dwiksad";
       };
     };
     "snyk-php-plugin-1.1.2" = {
@@ -18936,13 +18963,13 @@ let
         sha512 = "1vn9mfsmi72rnk8g69y27cpw9ljwv7qjnqmal344d0m20jjak38sz78xafc9l63j0s05bgax693548dn88ivgy5af2y8l8jp970vqp9";
       };
     };
-    "snyk-policy-1.7.1" = {
+    "snyk-policy-1.10.1" = {
       name = "snyk-policy";
       packageName = "snyk-policy";
-      version = "1.7.1";
+      version = "1.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.1.tgz";
-        sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22";
+        url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.10.1.tgz";
+        sha1 = "b1a26c8aef529c61604aca382111e535d511b763";
       };
     };
     "snyk-python-plugin-1.4.0" = {
@@ -19152,6 +19179,15 @@ let
         sha1 = "d17aea72ff2fba39b9e43601be7b3ff72e089852";
       };
     };
+    "email-validator-1.1.1" = {
+      name = "email-validator";
+      packageName = "email-validator";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/email-validator/-/email-validator-1.1.1.tgz";
+        sha512 = "3ydmy134p48c4zswbvjllak53h545dmzsz77bwpfxjf7aw510yyg4w58pazc2yz9agm93rphfgglrlj9cfkfdygcg1rbv0vj4jhjixy";
+      };
+    };
     "lodash.clonedeep-4.5.0" = {
       name = "lodash.clonedeep";
       packageName = "lodash.clonedeep";
@@ -19251,6 +19287,15 @@ let
         sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84";
       };
     };
+    "widest-line-1.0.0" = {
+      name = "widest-line";
+      packageName = "widest-line";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
+        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
+      };
+    };
     "package-json-2.4.0" = {
       name = "package-json";
       packageName = "package-json";
@@ -19350,13 +19395,13 @@ let
         sha1 = "df67e92bf12a796f49e928799c8db3ba74b9fcd6";
       };
     };
-    "https-proxy-agent-2.1.0" = {
+    "https-proxy-agent-2.1.1" = {
       name = "https-proxy-agent";
       packageName = "https-proxy-agent";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.0.tgz";
-        sha512 = "17fg8xbji1zam9ksqgdfsyhqfw1nyniz8gwp54q0z7rz1pxw2m3agniawm870nn4j88m1w9l0lfkw5wa4qf1593if0cwicv814xad7w";
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz";
+        sha512 = "0rxbj60hs8fhs3i02lgb6ypcf9m9v8ybd4lfvfvpy0f1iyy54f1686lmv0rvkyxxihwvs4yizjgv8r8jksh385c4c9yjm3z8i0svbic";
       };
     };
     "nodesecurity-npm-utils-6.0.0" = {
@@ -19515,13 +19560,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.4.4" = {
+    "service-runner-2.4.6" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.4.4";
+      version = "2.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.4.4.tgz";
-        sha1 = "336f5fdfb1c5be7ea78044a013bb08d58b9ce08f";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.4.6.tgz";
+        sha1 = "845f8d3be883ccb140f10c7c7bd2d650f11e849b";
       };
     };
     "simplediff-0.1.1" = {
@@ -20326,13 +20371,13 @@ let
         sha1 = "8085d390b4c19f7b02dee8a7cd873e2af58667b5";
       };
     };
-    "int64-buffer-0.1.9" = {
+    "int64-buffer-0.1.10" = {
       name = "int64-buffer";
       packageName = "int64-buffer";
-      version = "0.1.9";
+      version = "0.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.9.tgz";
-        sha1 = "9e039da043b24f78b196b283e04653ef5e990f61";
+        url = "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.10.tgz";
+        sha1 = "277b228a87d95ad777d07c13832022406a473423";
       };
     };
     "bufferutil-2.0.1" = {
@@ -21002,6 +21047,15 @@ let
         sha512 = "1qi9fsw42grlhv4aj7v42xikvicr5657809syvp4dca33fjzzr1h7x1q9zwhclpyb879g6bgb2yd4i2iasnpmxn8ng1dcnq85yg001r";
       };
     };
+    "boxen-1.2.2" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz";
+        sha1 = "3f1d4032c30ffea9d4b02c322eaf2ea741dcbce5";
+      };
+    };
     "clipboardy-1.1.4" = {
       name = "clipboardy";
       packageName = "clipboardy";
@@ -22463,13 +22517,13 @@ let
         sha1 = "449cbe2dbae5a8c8038e30d71fa0ff464947c4de";
       };
     };
-    "typescript-2.6.1" = {
+    "typescript-2.6.2" = {
       name = "typescript";
       packageName = "typescript";
-      version = "2.6.1";
+      version = "2.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz";
-        sha1 = "ef39cdea27abac0b500242d6726ab90e0c846631";
+        url = "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz";
+        sha1 = "3c5b6fd7f6de0914269027f03c0946758f7673a4";
       };
     };
     "zip-object-0.1.0" = {
@@ -25009,7 +25063,7 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."moment-2.19.2"
+      sources."moment-2.19.3"
       (sources."ms-rest-2.2.7" // {
         dependencies = [
           sources."moment-2.18.1"
@@ -25041,7 +25095,7 @@ in
         dependencies = [
           sources."readable-stream-2.0.6"
           sources."async-2.6.0"
-          sources."commander-2.12.1"
+          sources."commander-2.12.2"
         ];
       })
       sources."ssh-key-to-pem-0.11.0"
@@ -25109,11 +25163,12 @@ in
       sources."has-color-0.1.7"
       sources."ansi-styles-2.2.1"
       sources."strip-ansi-3.0.1"
-      sources."@types/node-8.0.53"
+      sources."@types/node-8.0.54"
       sources."@types/request-2.0.8"
       sources."@types/uuid-3.4.3"
       sources."is-buffer-1.1.6"
       sources."is-stream-1.1.0"
+      sources."@types/events-1.1.0"
       sources."@types/form-data-2.2.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
@@ -25136,7 +25191,7 @@ in
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -25269,7 +25324,7 @@ in
       sources."ext-list-2.2.2"
       sources."meow-3.7.0"
       sources."sort-keys-length-1.0.1"
-      sources."mime-db-1.31.0"
+      sources."mime-db-1.32.0"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
@@ -25477,7 +25532,7 @@ in
       sources."astw-2.2.0"
       sources."acorn-4.0.13"
       sources."stream-splicer-2.0.0"
-      sources."detective-4.6.0"
+      sources."detective-4.7.0"
       sources."stream-combiner2-1.1.1"
       sources."path-platform-0.11.15"
       sources."path-parse-1.0.5"
@@ -25703,7 +25758,7 @@ in
       sources."k-rpc-3.7.0"
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
-      sources."k-rpc-socket-1.7.1"
+      sources."k-rpc-socket-1.7.2"
       sources."bn.js-4.11.8"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
@@ -25744,7 +25799,7 @@ in
       sources."voc-1.0.0"
       sources."concat-stream-1.6.0"
       sources."exit-on-epipe-1.0.1"
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."typedarray-0.0.6"
       sources."sax-1.2.4"
       sources."underscore-1.6.0"
@@ -25789,7 +25844,7 @@ in
         ];
       })
       sources."cli-table2-0.2.0"
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."humanize-plus-1.8.2"
       sources."ora-1.3.0"
       sources."follow-redirects-1.2.6"
@@ -25953,7 +26008,7 @@ in
       sources."cordova-app-hello-world-3.12.0"
       sources."dependency-ls-1.1.1"
       sources."is-url-1.2.2"
-      sources."interpret-1.0.4"
+      sources."interpret-1.1.0"
       sources."rechoir-0.6.2"
       sources."fs.realpath-1.0.0"
       sources."resolve-1.1.7"
@@ -26053,7 +26108,7 @@ in
       sources."lexical-scope-1.2.0"
       sources."astw-2.2.0"
       sources."stream-splicer-2.0.0"
-      sources."detective-4.6.0"
+      sources."detective-4.7.0"
       sources."stream-combiner2-1.1.1"
       sources."path-platform-0.11.15"
       sources."json-stable-stringify-0.0.1"
@@ -26159,7 +26214,7 @@ in
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."is-my-json-valid-2.16.1"
       sources."pinkie-promise-2.0.1"
       sources."generate-function-2.0.0"
@@ -26377,7 +26432,7 @@ in
       sources."verror-1.10.0"
       sources."assert-plus-1.0.0"
       sources."core-util-is-1.0.2"
-      sources."extsprintf-1.3.0"
+      sources."extsprintf-1.4.0"
       sources."async-0.9.2"
       sources."ini-1.3.5"
       sources."optimist-0.6.1"
@@ -26531,7 +26586,7 @@ in
       sources."JSONStream-1.3.1"
       sources."async-2.6.0"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.157.0"
+      sources."aws-sdk-2.162.0"
       sources."ini-1.3.5"
       sources."optimist-0.6.1"
       sources."request-2.83.0"
@@ -26576,7 +26631,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -26613,10 +26668,10 @@ in
   elm-test = nodeEnv.buildNodePackage {
     name = "elm-test";
     packageName = "elm-test";
-    version = "0.18.10";
+    version = "0.18.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.10.tgz";
-      sha512 = "2c8i6smwbashg8yx2qqbix6lz8lxcn1rri7i414vxi9zxiglbsxr01p209zpa0bl1ib07syyz5pfw0nwfwyvmi42pb6gzk1xls6kniq";
+      url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.11.tgz";
+      sha512 = "0iafixjls9d9xrj786lx5vfdgh5lfr06cm3lnjza2q378y0banjx4072x0zqkjj88fia6caqf240px4ayyjdvcxar3v6bdr6x24kyf9";
     };
     dependencies = [
       (sources."binstall-1.2.0" // {
@@ -26643,6 +26698,7 @@ in
           sources."firstline-1.2.0"
         ];
       })
+      sources."split-1.0.1"
       sources."supports-color-4.2.0"
       sources."xmlbuilder-8.2.2"
       sources."request-2.79.0"
@@ -26669,7 +26725,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."is-my-json-valid-2.16.1"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-3.2.0"
@@ -26777,6 +26833,7 @@ in
       sources."find-elm-dependencies-1.0.2"
       sources."temp-0.8.3"
       sources."os-tmpdir-1.0.2"
+      sources."through-2.3.8"
       sources."has-flag-2.0.0"
     ];
     buildInputs = globalBuildInputs;
@@ -26993,13 +27050,13 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "4.12.0";
+    version = "4.12.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-4.12.0.tgz";
-      sha512 = "31dhiy1b963gcs7s1ickygwm87vm943l5mhcxxwg97yc113b7fmdrzcb1m9gr9h0pkqacrdcmn59x3mdcqg0a4bgc2gjz859lszh6rs";
+      url = "https://registry.npmjs.org/eslint/-/eslint-4.12.1.tgz";
+      sha512 = "11x6bn4js0f82wyzpafz3yadbda9zb2bmz0mpwm0fdwv8i6f9gfc2syf6l2ppq70447nzmybcz9npvbiby34wkxwk8rydgyx1hlxj6v";
     };
     dependencies = [
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       (sources."babel-code-frame-6.26.0" // {
         dependencies = [
           sources."chalk-1.1.3"
@@ -27089,7 +27146,7 @@ in
       sources."array-union-1.0.2"
       sources."arrify-1.0.1"
       sources."array-uniq-1.0.3"
-      sources."is-path-inside-1.0.0"
+      sources."is-path-inside-1.0.1"
       sources."pinkie-2.0.4"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -27158,7 +27215,7 @@ in
           sources."supports-color-2.0.0"
         ];
       })
-      (sources."eslint-4.12.0" // {
+      (sources."eslint-4.12.1" // {
         dependencies = [
           sources."chalk-2.3.0"
           sources."supports-color-4.5.0"
@@ -27172,7 +27229,7 @@ in
       sources."has-ansi-2.0.0"
       sources."strip-ansi-4.0.0"
       sources."ansi-regex-3.0.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       (sources."babel-code-frame-6.26.0" // {
         dependencies = [
           sources."chalk-1.1.3"
@@ -27253,7 +27310,7 @@ in
       sources."array-union-1.0.2"
       sources."arrify-1.0.1"
       sources."array-uniq-1.0.3"
-      sources."is-path-inside-1.0.0"
+      sources."is-path-inside-1.0.1"
       sources."pinkie-2.0.4"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -27447,7 +27504,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -27671,7 +27728,7 @@ in
       sources."async-2.6.0"
       sources."lodash.groupby-4.6.0"
       sources."minilog-3.1.0"
-      sources."simple-git-1.82.0"
+      sources."simple-git-1.84.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
       sources."lodash-4.17.4"
       sources."microee-0.0.6"
@@ -27814,7 +27871,7 @@ in
       sources."chalk-1.1.3"
       sources."deprecated-0.0.1"
       sources."gulp-util-3.0.8"
-      sources."interpret-1.0.4"
+      sources."interpret-1.1.0"
       sources."liftoff-2.3.0"
       sources."minimist-1.2.0"
       sources."orchestrator-0.3.8"
@@ -27937,7 +27994,7 @@ in
       sources."object.pick-1.3.0"
       sources."parse-filepath-1.0.1"
       sources."array-each-1.0.1"
-      sources."array-slice-1.0.0"
+      sources."array-slice-1.1.0"
       sources."is-absolute-0.2.6"
       sources."map-cache-0.2.2"
       sources."path-root-0.1.1"
@@ -27998,7 +28055,7 @@ in
       sources."redis-0.10.3"
       sources."lru-cache-2.5.2"
       sources."minimist-0.0.8"
-      sources."eventemitter3-2.0.3"
+      sources."eventemitter3-3.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -28083,12 +28140,12 @@ in
     dependencies = [
       sources."camel-case-3.0.0"
       sources."clean-css-4.1.9"
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."he-1.1.1"
       sources."ncname-1.0.0"
       sources."param-case-2.1.1"
       sources."relateurl-0.2.7"
-      sources."uglify-js-3.2.0"
+      sources."uglify-js-3.2.1"
       sources."no-case-2.3.2"
       sources."upper-case-1.1.3"
       sources."lower-case-1.1.4"
@@ -28176,7 +28233,7 @@ in
       sources."slice-ansi-1.0.0"
       sources."ssh-config-1.1.3"
       sources."string-width-2.1.1"
-      sources."tar-4.0.2"
+      sources."tar-4.1.1"
       sources."tiny-lr-1.0.5"
       sources."uuid-3.1.0"
       sources."wrap-ansi-3.0.1"
@@ -28319,6 +28376,7 @@ in
       sources."win-release-1.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."chownr-1.0.1"
+      sources."fs-minipass-1.2.3"
       sources."minipass-2.2.1"
       sources."minizlib-1.0.4"
       sources."mkdirp-0.5.1"
@@ -28457,7 +28515,7 @@ in
       sources."chai-4.1.2"
       sources."chai-as-promised-7.1.1"
       sources."chalk-2.3.0"
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."fast-json-patch-2.0.6"
       sources."glob-7.1.2"
       sources."iterare-0.0.8"
@@ -28470,7 +28528,7 @@ in
       sources."mz-2.7.0"
       sources."object-hash-1.2.0"
       sources."opentracing-0.14.1"
-      sources."rxjs-5.5.2"
+      sources."rxjs-5.5.3"
       sources."semaphore-async-await-1.5.1"
       sources."string-similarity-1.2.0"
       sources."typescript-2.4.2"
@@ -28513,7 +28571,7 @@ in
       sources."object-assign-4.1.1"
       sources."thenify-all-1.6.0"
       sources."thenify-3.3.0"
-      sources."symbol-observable-1.0.4"
+      sources."symbol-observable-1.1.0"
       sources."vscode-uri-1.0.1"
       sources."vscode-languageserver-protocol-3.5.0"
     ];
@@ -28621,7 +28679,7 @@ in
       sources."proto-list-1.2.4"
       sources."ini-1.3.5"
       sources."bluebird-3.5.1"
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."lru-cache-3.2.0"
       sources."semver-5.4.1"
       sources."sigmund-1.0.1"
@@ -28685,7 +28743,7 @@ in
       sha512 = "0m7az6dvfn65fbak1y42663yxkachpj1fyyxxpdhkpny3bbsmgn0hpp8fb5sllmzbfyqspkqh1icpqb14pbsfnbsj7w665xmnj4a9g5";
     };
     dependencies = [
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."graphlib-2.1.1"
       sources."js-yaml-3.10.0"
       sources."lodash-4.17.4"
@@ -28841,7 +28899,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -28866,7 +28924,7 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
-      sources."boxen-1.2.2"
+      sources."boxen-1.3.0"
       sources."configstore-3.1.1"
       sources."import-lazy-2.1.0"
       sources."is-installed-globally-0.1.0"
@@ -28879,10 +28937,10 @@ in
       sources."cli-boxes-1.0.0"
       sources."string-width-1.0.2"
       sources."term-size-1.2.0"
-      sources."widest-line-1.0.0"
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."strip-ansi-4.0.0"
-      sources."ansi-regex-3.0.0"
+      sources."widest-line-2.0.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."strip-ansi-3.0.1"
+      sources."ansi-regex-2.1.1"
       sources."execa-0.7.0"
       sources."cross-spawn-5.1.0"
       sources."get-stream-3.0.0"
@@ -28899,8 +28957,6 @@ in
       sources."shebang-regex-1.0.0"
       sources."isexe-2.0.0"
       sources."path-key-2.0.1"
-      sources."code-point-at-1.1.0"
-      sources."number-is-nan-1.0.1"
       sources."dot-prop-4.2.0"
       sources."make-dir-1.1.0"
       sources."unique-string-1.0.0"
@@ -28910,7 +28966,7 @@ in
       sources."crypto-random-string-1.0.0"
       sources."imurmurhash-0.1.4"
       sources."global-dirs-0.1.1"
-      sources."is-path-inside-1.0.0"
+      sources."is-path-inside-1.0.1"
       sources."ini-1.3.5"
       sources."path-is-inside-1.0.2"
       sources."package-json-4.0.1"
@@ -28944,6 +29000,8 @@ in
       sources."y18n-3.2.1"
       sources."yargs-parser-8.0.0"
       sources."wrap-ansi-2.1.0"
+      sources."code-point-at-1.1.0"
+      sources."number-is-nan-1.0.1"
       sources."locate-path-2.0.0"
       sources."p-locate-2.0.0"
       sources."path-exists-3.0.0"
@@ -29528,7 +29586,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."byline-5.0.0"
       sources."duplexer-0.1.1"
-      sources."moment-2.19.2"
+      sources."moment-2.19.3"
       sources."make-dir-1.1.0"
       sources."temp-dir-1.0.0"
       sources."imurmurhash-0.1.4"
@@ -29823,7 +29881,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -30101,7 +30159,7 @@ in
       sha1 = "0161a13e2b3378759e36b9e05be34b46a06decd5";
     };
     dependencies = [
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."js-yaml-3.10.0"
       sources."json-refs-2.1.7"
       sources."argparse-1.0.9"
@@ -30245,7 +30303,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -30393,7 +30451,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -30896,7 +30954,7 @@ in
       sources."stream-combiner-0.0.4"
       sources."nopt-1.0.10"
       sources."abbrev-1.1.1"
-      sources."boxen-1.2.2"
+      sources."boxen-1.3.0"
       sources."chalk-2.3.0"
       sources."configstore-3.1.1"
       sources."import-lazy-2.1.0"
@@ -30908,12 +30966,12 @@ in
       sources."ansi-align-2.0.0"
       sources."camelcase-4.1.0"
       sources."cli-boxes-1.0.0"
-      sources."string-width-1.0.2"
+      sources."string-width-2.1.1"
       sources."term-size-1.2.0"
-      sources."widest-line-1.0.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."ansi-regex-2.1.1"
+      sources."widest-line-2.0.0"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."strip-ansi-4.0.0"
+      sources."ansi-regex-3.0.0"
       sources."execa-0.7.0"
       sources."cross-spawn-5.1.0"
       sources."get-stream-3.0.0"
@@ -30930,8 +30988,6 @@ in
       sources."shebang-regex-1.0.0"
       sources."isexe-2.0.0"
       sources."path-key-2.0.1"
-      sources."code-point-at-1.1.0"
-      sources."number-is-nan-1.0.1"
       sources."ansi-styles-3.2.0"
       sources."escape-string-regexp-1.0.5"
       sources."supports-color-4.5.0"
@@ -30947,7 +31003,7 @@ in
       sources."crypto-random-string-1.0.0"
       sources."imurmurhash-0.1.4"
       sources."global-dirs-0.1.1"
-      sources."is-path-inside-1.0.0"
+      sources."is-path-inside-1.0.1"
       sources."ini-1.3.5"
       sources."path-is-inside-1.0.2"
       sources."package-json-4.0.1"
@@ -31090,7 +31146,7 @@ in
       sources."object-assign-4.1.1"
       sources."vary-1.1.2"
       sources."moment-timezone-0.5.14"
-      sources."moment-2.19.2"
+      sources."moment-2.19.3"
       sources."accepts-1.3.4"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.2"
@@ -31275,7 +31331,7 @@ in
       sources."performance-now-2.1.0"
       sources."uuid-3.1.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -31504,7 +31560,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -31598,7 +31654,7 @@ in
       sources."chalk-1.1.3"
       sources."cint-8.2.1"
       sources."cli-table-0.3.1"
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."fast-diff-1.1.2"
       sources."find-up-1.1.2"
       sources."get-stdin-5.0.1"
@@ -31613,7 +31669,7 @@ in
       })
       sources."semver-5.4.1"
       sources."semver-utils-1.1.1"
-      (sources."snyk-1.51.0" // {
+      (sources."snyk-1.53.0" // {
         dependencies = [
           sources."update-notifier-0.5.0"
         ];
@@ -31651,9 +31707,9 @@ in
       sources."snyk-gradle-plugin-1.2.0"
       sources."snyk-module-1.8.1"
       sources."snyk-mvn-plugin-1.1.0"
-      sources."snyk-nuget-plugin-1.3.2"
+      sources."snyk-nuget-plugin-1.3.3"
       sources."snyk-php-plugin-1.1.2"
-      sources."snyk-policy-1.7.1"
+      sources."snyk-policy-1.10.1"
       sources."snyk-python-plugin-1.4.0"
       sources."snyk-recursive-readdir-2.0.0"
       sources."snyk-resolve-1.0.0"
@@ -31736,6 +31792,7 @@ in
       sources."bops-0.1.1"
       sources."base64-js-0.0.2"
       sources."to-utf8-0.0.1"
+      sources."email-validator-1.1.1"
       sources."js-yaml-3.10.0"
       sources."lodash.clonedeep-4.5.0"
       sources."argparse-1.0.9"
@@ -31751,13 +31808,13 @@ in
       sources."lodash.defaults-4.2.0"
       sources."lodash.defaultsdeep-4.6.0"
       sources."lodash.mergewith-4.6.0"
-      sources."boxen-1.2.2"
+      sources."boxen-1.3.0"
       sources."is-npm-1.0.0"
       sources."latest-version-3.1.0"
       sources."semver-diff-2.1.0"
       sources."filled-array-1.1.0"
       sources."repeating-1.1.3"
-      sources."widest-line-1.0.0"
+      sources."widest-line-2.0.0"
       sources."is-finite-1.0.2"
       sources."dot-prop-4.2.0"
       sources."is-obj-1.0.1"
@@ -31857,7 +31914,7 @@ in
       sources."unique-string-1.0.0"
       sources."crypto-random-string-1.0.0"
       sources."global-dirs-0.1.1"
-      sources."is-path-inside-1.0.0"
+      sources."is-path-inside-1.0.1"
       sources."path-is-inside-1.0.2"
       sources."duplexer3-0.1.4"
     ];
@@ -31881,7 +31938,7 @@ in
       sources."chalk-2.3.0"
       sources."cli-table2-0.2.0"
       sources."cvss-1.0.2"
-      sources."https-proxy-agent-2.1.0"
+      sources."https-proxy-agent-2.1.1"
       sources."inquirer-3.3.0"
       sources."nodesecurity-npm-utils-6.0.0"
       sources."semver-5.4.1"
@@ -31902,7 +31959,7 @@ in
       sources."number-is-nan-1.0.1"
       sources."ansi-regex-2.1.1"
       sources."agent-base-4.1.2"
-      sources."debug-2.6.9"
+      sources."debug-3.1.0"
       sources."es6-promisify-5.0.0"
       sources."es6-promise-4.1.1"
       sources."ms-2.0.0"
@@ -31992,10 +32049,10 @@ in
   ocaml-language-server = nodeEnv.buildNodePackage {
     name = "ocaml-language-server";
     packageName = "ocaml-language-server";
-    version = "1.0.14";
+    version = "1.0.16";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.14.tgz";
-      sha512 = "29fqx01qg82gmlmq2x6akj2i9kg9qpwss9lrrpfd3m34lcp15ak8dbzhh0szv28laafhrfqzzsi4nvmd0p1g284xadw2afk1pg539x3";
+      url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.16.tgz";
+      sha512 = "2f63gvm5x3c7dxp8fpaxhvjlha7isdfrbq7pqpkj0n33zndhi4925qkmzgrgn7qhrff6dhiqb3j1a3m1jjwq1k5kff910rrxd1622jd";
     };
     dependencies = [
       sources."async-2.6.0"
@@ -32006,7 +32063,7 @@ in
       sources."vscode-jsonrpc-3.5.0"
       sources."vscode-languageclient-3.5.0"
       sources."vscode-languageserver-3.5.0"
-      sources."vscode-languageserver-types-3.5.0"
+      sources."vscode-languageserver-protocol-3.5.0"
       sources."vscode-uri-1.0.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -32018,7 +32075,7 @@ in
       sources."brace-expansion-1.1.8"
       sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."vscode-languageserver-protocol-3.5.0"
+      sources."vscode-languageserver-types-3.5.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -32071,7 +32128,7 @@ in
       sources."request-2.83.0"
       sources."semver-5.4.1"
       sources."serve-favicon-2.4.5"
-      sources."service-runner-2.4.4"
+      sources."service-runner-2.4.6"
       sources."simplediff-0.1.1"
       sources."uuid-3.1.0"
       sources."yargs-7.1.0"
@@ -32187,7 +32244,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -32221,7 +32278,7 @@ in
       sources."dtrace-provider-0.8.5"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
-      sources."moment-2.19.2"
+      sources."moment-2.19.3"
       sources."nan-2.8.0"
       sources."mkdirp-0.5.1"
       sources."ncp-2.0.0"
@@ -32489,7 +32546,7 @@ in
       sources."k-rpc-3.7.0"
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
-      sources."k-rpc-socket-1.7.1"
+      sources."k-rpc-socket-1.7.2"
       sources."bn.js-4.11.8"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
@@ -32719,7 +32776,7 @@ in
       sources."k-rpc-3.7.0"
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
-      sources."k-rpc-socket-1.7.1"
+      sources."k-rpc-socket-1.7.2"
       sources."bn.js-4.11.8"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
@@ -32838,7 +32895,7 @@ in
       sources."sntp-1.0.9"
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."is-my-json-valid-2.16.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -33008,7 +33065,7 @@ in
       sources."astw-2.2.0"
       sources."acorn-4.0.13"
       sources."stream-splicer-2.0.0"
-      sources."detective-4.6.0"
+      sources."detective-4.7.0"
       sources."stream-combiner2-1.1.1"
       sources."path-platform-0.11.15"
       sources."path-parse-1.0.5"
@@ -33102,7 +33159,7 @@ in
     };
     dependencies = [
       sources."body-parser-1.18.2"
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."cookie-parser-1.4.3"
       sources."express-4.16.2"
       sources."less-2.7.3"
@@ -33221,7 +33278,7 @@ in
       sources."is-3.2.1"
       sources."eventemitter2-3.0.2"
       sources."qtdatastream-0.7.1"
-      sources."int64-buffer-0.1.9"
+      sources."int64-buffer-0.1.10"
       sources."basic-auth-2.0.0"
       sources."on-headers-1.0.1"
       sources."bufferutil-2.0.1"
@@ -33340,8 +33397,8 @@ in
     dependencies = [
       sources."commoner-0.10.8"
       sources."jstransform-10.1.0"
-      sources."commander-2.12.1"
-      sources."detective-4.6.0"
+      sources."commander-2.12.2"
+      sources."detective-4.7.0"
       sources."glob-5.0.15"
       sources."graceful-fs-4.1.11"
       sources."iconv-lite-0.4.19"
@@ -33458,7 +33515,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -33647,7 +33704,7 @@ in
       sources."crypto-random-string-1.0.0"
       sources."imurmurhash-0.1.4"
       sources."global-dirs-0.1.1"
-      sources."is-path-inside-1.0.0"
+      sources."is-path-inside-1.0.1"
       sources."ini-1.3.5"
       sources."path-is-inside-1.0.2"
       sources."package-json-4.0.1"
@@ -33688,7 +33745,7 @@ in
     dependencies = [
       sources."bcrypt-nodejs-0.0.3"
       sources."cheerio-0.17.0"
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."event-stream-3.3.4"
       sources."express-4.16.2"
       sources."lodash-2.4.2"
@@ -33790,7 +33847,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -33872,7 +33929,7 @@ in
       sources."express-json5-0.1.0"
       sources."body-parser-1.18.2"
       sources."compression-1.7.1"
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."js-yaml-3.10.0"
       sources."cookies-0.7.1"
       sources."request-2.83.0"
@@ -33977,7 +34034,7 @@ in
       sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -34007,7 +34064,7 @@ in
       sources."dtrace-provider-0.8.5"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
-      sources."moment-2.19.2"
+      sources."moment-2.19.3"
       sources."nan-2.8.0"
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
@@ -34278,6 +34335,22 @@ in
     };
     production = true;
   };
+  stackdriver-statsd-backend = nodeEnv.buildNodePackage {
+    name = "stackdriver-statsd-backend";
+    packageName = "stackdriver-statsd-backend";
+    version = "0.2.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz";
+      sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Send metric data from statsd to Stackdriver";
+      homepage = https://www.stackdriver.com/;
+      license = "MIT";
+    };
+    production = true;
+  };
   statsd = nodeEnv.buildNodePackage {
     name = "statsd";
     packageName = "statsd";
@@ -34306,6 +34379,41 @@ in
     };
     production = true;
   };
+  statsd-influxdb-backend = nodeEnv.buildNodePackage {
+    name = "statsd-influxdb-backend";
+    packageName = "statsd-influxdb-backend";
+    version = "0.6.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz";
+      sha1 = "25fb83cf0b3af923dfc7d506eb1208def8790d78";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "InfluxDB backend for StatsD";
+      homepage = https://github.com/bernd/statsd-influxdb-backend;
+      license = "BSD";
+    };
+    production = true;
+  };
+  statsd-librato-backend = nodeEnv.buildNodePackage {
+    name = "statsd-librato-backend";
+    packageName = "statsd-librato-backend";
+    version = "2.0.16";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-2.0.16.tgz";
+      sha1 = "6c6a0d14684f0341e5ba013eed30302545532bc6";
+    };
+    dependencies = [
+      sources."extend-3.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A StatsD backend for Librato Metrics";
+      homepage = https://github.com/librato/statsd-librato-backend;
+      license = "MIT";
+    };
+    production = true;
+  };
   stylus = nodeEnv.buildNodePackage {
     name = "stylus";
     packageName = "stylus";
@@ -34449,10 +34557,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.6.1";
+    version = "2.6.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz";
-      sha1 = "ef39cdea27abac0b500242d6726ab90e0c846631";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz";
+      sha1 = "3c5b6fd7f6de0914269027f03c0946758f7673a4";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -34501,8 +34609,8 @@ in
       sources."supports-color-4.5.0"
       sources."ansi-regex-2.1.1"
       sources."slice-ansi-1.0.0"
-      sources."string-width-1.0.2"
-      sources."is-fullwidth-code-point-1.0.0"
+      sources."string-width-2.1.1"
+      sources."is-fullwidth-code-point-2.0.0"
       sources."wcwidth-1.0.1"
       sources."defaults-1.0.3"
       sources."clone-1.0.3"
@@ -34538,7 +34646,7 @@ in
       sources."thenify-3.3.0"
       sources."throat-3.2.0"
       sources."touch-1.0.0"
-      sources."typescript-2.6.1"
+      sources."typescript-2.6.2"
       sources."zip-object-0.1.0"
       sources."dot-prop-4.2.0"
       sources."make-dir-1.1.0"
@@ -34602,7 +34710,7 @@ in
       sources."is-plain-obj-1.1.0"
       sources."nopt-1.0.10"
       sources."abbrev-1.1.1"
-      sources."boxen-1.2.2"
+      sources."boxen-1.3.0"
       sources."import-lazy-2.1.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
@@ -34612,7 +34720,7 @@ in
       sources."camelcase-4.1.0"
       sources."cli-boxes-1.0.0"
       sources."term-size-1.2.0"
-      sources."widest-line-1.0.0"
+      sources."widest-line-2.0.0"
       sources."execa-0.7.0"
       sources."cross-spawn-5.1.0"
       sources."get-stream-3.0.0"
@@ -34628,13 +34736,11 @@ in
       sources."shebang-regex-1.0.0"
       sources."isexe-2.0.0"
       sources."path-key-2.0.1"
-      sources."code-point-at-1.1.0"
-      sources."number-is-nan-1.0.1"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
       sources."has-flag-2.0.0"
       sources."global-dirs-0.1.1"
-      sources."is-path-inside-1.0.0"
+      sources."is-path-inside-1.0.1"
       sources."path-is-inside-1.0.2"
       sources."package-json-4.0.1"
       sources."got-6.7.1"
@@ -34662,13 +34768,13 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.2.0";
+    version = "3.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.2.0.tgz";
-      sha512 = "2vgdxdcacmfv1079k2pbqi0cmgyg2xha1l1h91dnjb80wym2krmbq4i3kwk0ivknhj3mxm7iq584kx0rjyscz31cjkz38117fah7prg";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.2.1.tgz";
+      sha512 = "0rf96f9yqhh3vvkiv26h088xwpqs5sp5a7yd9cayxb9fdn997vg2jjh85fmii9c2w3kx3d3phf0mr38bxwxmw9rfaag8a4fz4j565h6";
     };
     dependencies = [
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."source-map-0.6.1"
     ];
     buildInputs = globalBuildInputs;
@@ -34682,10 +34788,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.3.0";
+    version = "1.3.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.3.0.tgz";
-      sha512 = "06zgy1ilw44nwvz1vdxa067j95gmpswcr0fa5r57vmb3s0v6bmw0kwblgd3cridr88rlm4aidb7gvb6z9972897cya191mm97g6xr5r";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.3.2.tgz";
+      sha512 = "3ywhdm1ca6k8wyppz87sjz9ch8qd7cdzf6prjfqvbsp1d1hascvv4c5y442gkibqfy7v0k3m2ipvyr0vjv0n26hx1l2rlx1kvjp9fnr";
     };
     dependencies = [
       sources."async-2.5.0"
@@ -34867,7 +34973,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."uuid-3.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -35113,7 +35219,7 @@ in
       sources."sntp-1.0.9"
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
-      sources."commander-2.12.1"
+      sources."commander-2.12.2"
       sources."is-my-json-valid-2.16.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -35142,10 +35248,10 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "3.8.1";
+    version = "3.9.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz";
-      sha512 = "1pjbfhy4mpjb68hg0k70iz51c13yq6biln5wyb3jg8ddbgc3qwhnqgxvd19if6sihd10yc42yrj50p451qkgd4wmy2p5a0cddcwp5g5";
+      url = "https://registry.npmjs.org/webpack/-/webpack-3.9.1.tgz";
+      sha512 = "15m1bix5419hn7n5kr9ncs3cc0p1159j2wfgbs3vylf2s54w4ah3wpw99q0asyml4aji4656siqnmacpn9xgb2aas80iai7bz94kqwc";
     };
     dependencies = [
       sources."acorn-5.2.1"
@@ -35154,12 +35260,12 @@ in
           sources."acorn-4.0.13"
         ];
       })
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."ajv-keywords-2.1.1"
       sources."async-2.6.0"
       sources."enhanced-resolve-3.4.1"
       sources."escope-3.6.0"
-      sources."interpret-1.0.4"
+      sources."interpret-1.1.0"
       sources."json-loader-0.5.7"
       sources."json5-0.5.1"
       sources."loader-runner-2.3.0"
@@ -35556,7 +35662,8 @@ in
       sources."safe-buffer-5.1.1"
       sources."string_decoder-1.0.3"
       sources."util-deprecate-1.0.2"
-      sources."@types/node-8.0.53"
+      sources."@types/node-8.0.54"
+      sources."@types/events-1.1.0"
       sources."wcwidth-1.0.1"
       sources."defaults-1.0.3"
       sources."clone-1.0.3"
@@ -35744,7 +35851,7 @@ in
       sources."array-union-1.0.2"
       sources."arrify-1.0.1"
       sources."array-uniq-1.0.3"
-      sources."is-path-inside-1.0.0"
+      sources."is-path-inside-1.0.1"
       sources."pinkie-2.0.4"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -35791,7 +35898,7 @@ in
       sources."generate-object-property-1.2.0"
       sources."jsonpointer-4.0.1"
       sources."is-property-1.0.2"
-      sources."interpret-1.0.4"
+      sources."interpret-1.1.0"
       sources."rechoir-0.6.2"
       sources."resolve-1.5.0"
       sources."path-parse-1.0.5"
@@ -35815,7 +35922,7 @@ in
       sources."dtrace-provider-0.8.5"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
-      sources."moment-2.19.2"
+      sources."moment-2.19.3"
       sources."nan-2.8.0"
       sources."ncp-2.0.0"
       sources."es6-promise-2.3.0"
@@ -35918,7 +36025,7 @@ in
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.11.0"
       sources."set-immediate-shim-1.0.1"
-      sources."boxen-1.2.2"
+      sources."boxen-1.3.0"
       sources."configstore-3.1.1"
       sources."import-lazy-2.1.0"
       sources."is-npm-1.0.0"
@@ -35928,7 +36035,7 @@ in
       sources."ansi-align-2.0.0"
       sources."cli-boxes-1.0.0"
       sources."term-size-1.2.0"
-      sources."widest-line-1.0.0"
+      sources."widest-line-2.0.0"
       sources."dot-prop-4.2.0"
       sources."make-dir-1.1.0"
       sources."unique-string-1.0.0"
@@ -36191,7 +36298,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."ajv-5.5.0"
+      sources."ajv-5.5.1"
       sources."har-schema-2.0.0"
       sources."co-4.6.0"
       sources."fast-deep-equal-1.0.0"
@@ -36289,7 +36396,7 @@ in
       sources."lodash.pad-4.5.1"
       sources."lodash.padend-4.6.1"
       sources."lodash.padstart-4.6.1"
-      sources."boxen-1.2.2"
+      sources."boxen-1.3.0"
       sources."import-lazy-2.1.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
@@ -36298,9 +36405,9 @@ in
       sources."ansi-align-2.0.0"
       sources."cli-boxes-1.0.0"
       sources."term-size-1.2.0"
-      sources."widest-line-1.0.0"
+      sources."widest-line-2.0.0"
       sources."global-dirs-0.1.1"
-      sources."is-path-inside-1.0.0"
+      sources."is-path-inside-1.0.1"
       sources."path-is-inside-1.0.2"
       sources."bin-version-check-2.1.0"
       sources."each-async-1.1.1"
diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix
index 94c2e120883..73ffd7f41ea 100644
--- a/pkgs/development/ocaml-modules/ocurl/default.nix
+++ b/pkgs/development/ocaml-modules/ocurl/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, ocaml, findlib, fetchurl, curl, ncurses }:
+{ stdenv, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ocurl-0.7.8";
+  name = "ocurl-0.8.0";
   src = fetchurl {
-    url = "https://forge.ocamlcore.org/frs/download.php/1463/${name}.tar.bz2";
-    sha256 = "0yn7f3g5wva8nqxh76adpq9rihggc405jkqysfghzwnf3yymyqrr";
+    url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz";
+    sha256 = "0292knvm9g038br0dc03lcsnbjqycyiqha256dp4bxkz3vmmz4wr";
   };
 
-  buildInputs = [ ocaml findlib ncurses ];
+  buildInputs = [ pkgconfig ocaml findlib ncurses ];
   propagatedBuildInputs = [ curl ];
   createFindlibDestdir = true;
   meta = {
     description = "OCaml bindings to libcurl";
-    license = stdenv.lib.licenses.bsd3;
-    homepage = http://ocurl.forge.ocamlcore.org/;
+    license = stdenv.lib.licenses.mit;
+    homepage = "http://ygrek.org.ua/p/ocurl/";
     maintainers = with stdenv.lib.maintainers; [ bennofs ];
     platforms = ocaml.meta.platforms or [];
   };
diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index 70c6f3baaf1..43a0a42f8e9 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "zc.buildout";
-  version = "2.9.5";
+  version = "2.10.0";
   name = "${pname}-nix-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "dce840ea379e2ff10bae27465778708704e0a4287cde92eb6c7961f5b0277cfa";
+    sha256 = "00wi0f6wpfl2gywr02x2yqvx6i1k0ll5w4lhdl0khijk4g7mk8dq";
   };
 
   patches = [ ./nix.patch ];
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 2f794c583e5..be967e1f86c 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, findlib, camlp4, sedlex, ocamlbuild }:
+{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, findlib, camlp4, sedlex, ocamlbuild, ocaml_lwt }:
 
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.59.0";
+  version = "0.60.1";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "1i47k9dg3pawwkdccb57n6882q92jsmclk5ip2y6dv5hhv4s5z49";
+    sha256 = "1bi0m42qkdlljkk4lh85y8ncrn8im6mbn291b3305lf4pm0x59kd";
   };
 
   installPhase = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp bin/flow $out/bin/
   '';
 
-  buildInputs = [ ocaml libelf findlib camlp4 sedlex ocamlbuild ]
+  buildInputs = [ ocaml libelf findlib camlp4 sedlex ocamlbuild ocaml_lwt ]
     ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 007ce5b07cd..89996b3d30d 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -1,65 +1,96 @@
 { stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
 
-stdenv.mkDerivation rec {
-  name = "dub-${version}";
-  version = "1.5.0";
+let
 
-  src = fetchFromGitHub {
-    owner = "dlang";
-    repo = "dub";
-    rev = "v${version}";
-    sha256 = "0kmirx4ijhzirjwdqmnwqhngg38zdaydpvny2p0yj3afqgkj6vq5";
+  dubBuild = stdenv.mkDerivation rec {
+    name = "dubBuild-${version}";
+    version = "1.6.0";
+
+    enableParallelBuilding = true;
+
+    src = fetchFromGitHub {
+      owner = "dlang";
+      repo = "dub";
+      rev = "v${version}";
+      sha256 = "1xjr5pp263lbcd4harxy1ybh7q0kzj9iyy63ji6pn66fizrgm7zk";
+    };
+
+    postPatch = ''
+      # Avoid that the version file is overwritten
+      substituteInPlace build.sh \
+        --replace source/dub/version_.d /dev/null
+
+      patchShebangs .
+    '';
+
+    nativeBuildInputs = [ dmd libevent rsync ];
+    buildInputs = [ curl ];
+
+    buildPhase = ''
+      export DMD=${dmd.out}/bin/dmd
+      ./build.sh
+    '';
+
+    installPhase = ''
+      mkdir $out
+      mkdir $out/bin
+      cp bin/dub $out/bin
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Package and build manager for D applications and libraries";
+      homepage = http://code.dlang.org/;
+      license = licenses.mit;
+      maintainers = with maintainers; [ ThomasMader ];
+      platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+    };
   };
 
-  postPatch = ''
-    # Avoid that the version file is overwritten
-    substituteInPlace build.sh \
-      --replace source/dub/version_.d /dev/null
+  # Need to test in a fixed-output derivation, otherwise the
+  # network tests would fail if sandbox mode is enabled.
+  dubUnittests = stdenv.mkDerivation rec {
+    name = "dubUnittests-${version}";
+    version = dubBuild.version;
 
-    substituteInPlace build.sh \
-      --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_
+    enableParallelBuilding = dubBuild.enableParallelBuilding;
+    preferLocalBuild = true;
+    inputString = dubBuild.outPath;
+    outputHashAlgo = "sha256";
+    outputHash = builtins.hashString "sha256" inputString;
 
-    patchShebangs build.sh
-    patchShebangs test
+    src = dubBuild.src;
 
-    # Remove unittest which is not working for now (upstream already fixed: https://github.com/dlang/dub/issues/1224)
-    rm test/interactive-remove.sh
+    postPatch = dubBuild.postPatch;
 
-    # Fix test as long as there is no upstream solution. (see https://github.com/dlang/dub/pull/1227)
-    substituteInPlace test/issue884-init-defer-file-creation.sh \
-      --replace "< /dev/stdin" "<(while :; do sleep 1; done)" \
-      --replace "sleep 1" ""
-  '';
+    nativeBuildInputs = dubBuild.nativeBuildInputs;
+    buildInputs = dubBuild.buildInputs;
 
-  nativeBuildInputs = [ dmd libevent rsync ];
-  buildInputs = [ curl ];
-
-  buildPhase = ''
-    export DMD=${dmd.out}/bin/dmd
-    ./build.sh
-  '';
-
-  doCheck = false;
-
-  checkPhase = ''
-      export DUB=$PWD/bin/dub
+    buildPhase = ''
+      # Can't use dub from dubBuild directly because one unittest 
+      # (issue895-local-configuration) needs to generate a config 
+      # file under ../etc relative to the dub location.
+      cp ${dubBuild}/bin/dub bin/
+      export DUB=$NIX_BUILD_TOP/source/bin/dub
       export DC=${dmd.out}/bin/dmd
       export HOME=$TMP
       ./test/run-unittest.sh
-  '';
+    '';
+
+    installPhase = ''
+        echo -n $inputString > $out
+    '';
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  inherit dubUnittests;
+  name = "dub-${dubBuild.version}";
+  phases = "installPhase";
 
   installPhase = ''
     mkdir $out
-    mkdir $out/bin
-    cp bin/dub $out/bin
+    cp -r --symbolic-link ${dubBuild}/* $out/
   '';
-
-  meta = with stdenv.lib; {
-    description = "Package and build manager for D applications and libraries";
-    homepage = http://code.dlang.org/;
-    license = licenses.mit;
-    maintainers = with maintainers; [ ThomasMader ];
-    platforms = platforms.unix;
-  };
 }
 
diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix
index 21f6e68e416..1baff486c23 100644
--- a/pkgs/games/cataclysm-dda/git.nix
+++ b/pkgs/games/cataclysm-dda/git.nix
@@ -33,7 +33,10 @@ stdenv.mkDerivation rec {
       --add-flags "--datadir $out/share/cataclysm-dda/"
   '';
 
-  enableParallelBuilding = true;
+  # https://hydra.nixos.org/build/65193254
+  # src/weather_data.cpp:203:1: fatal error: opening dependency file obj/tiles/weather_data.d: No such file or directory
+  # make: *** [Makefile:687: obj/tiles/weather_data.o] Error 1
+  enableParallelBuilding = false;
 
   meta = with stdenv.lib; {
     description = "A free, post apocalyptic, zombie infested rogue-like";
diff --git a/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch b/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch
deleted file mode 100644
index 12fcdb4fd02..00000000000
--- a/pkgs/servers/osrm-backend/4.5.0-default-profile-path.template.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/extractor/extractor_options.cpp b/extractor/extractor_options.cpp
-index d14d8d9..c64d7fd 100644
---- a/extractor/extractor_options.cpp
-+++ b/extractor/extractor_options.cpp
-@@ -50,7 +50,7 @@ bool ExtractorOptions::ParseArguments(int argc, char *argv[], ExtractorConfig &e
-     boost::program_options::options_description config_options("Configuration");
-     config_options.add_options()("profile,p",
-                                  boost::program_options::value<boost::filesystem::path>(
--                                     &extractor_config.profile_path)->default_value("profile.lua"),
-+                                     &extractor_config.profile_path)->default_value("@out@/profiles/car.lua"),
-                                  "Path to LUA routing profile")(
-         "threads,t",
-         boost::program_options::value<unsigned int>(&extractor_config.requested_num_threads)
diff --git a/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch b/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch
deleted file mode 100644
index 87b9b9501c4..00000000000
--- a/pkgs/servers/osrm-backend/4.5.0-gcc-binutils.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -127,8 +127,9 @@ if(CMAKE_BUILD_TYPE MATCHES Release)
-     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
-         NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0" AND NOT MINGW)
-       message(STATUS "Using gcc specific binutils for LTO.")
--      set(CMAKE_AR     "/usr/bin/gcc-ar")
--      set(CMAKE_RANLIB "/usr/bin/gcc-ranlib")
-+      # Just let PATH do its job
-+      set(CMAKE_AR     "gcc-ar")
-+      set(CMAKE_RANLIB "gcc-ranlib")
-     endif()
-   endif (HAS_LTO_FLAG)
- endif()
diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 8846f50c886..7ade52b2ee7 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -1,24 +1,17 @@
-{stdenv, fetchFromGitHub, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib, substituteAll}:
+{stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}:
 
 stdenv.mkDerivation rec {
   name = "osrm-backend-${version}";
-  version = "4.9.1";
+  version = "5.14.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner  = "Project-OSRM";
     repo   = "osrm-backend";
-    sha256 = "1r4dwniwxgfppnb9asdh98w5qxqwkjhp9gc5fabmck0gk73cwkcc";
+    sha256 = "0n7fpm8m5r93dxciagp2n8ij1wg483yb9srbzdzjqf1zzyh637sz";
   };
 
-  patches = [
-    ./4.5.0-gcc-binutils.patch
-    (substituteAll {
-      src = ./4.5.0-default-profile-path.template.patch;
-    })
-  ];
-
-  buildInputs = [ cmake luabind libosmpbf stxxl tbb boost expat protobuf bzip2 zlib ];
+  buildInputs = [ cmake pkgconfig bzip2 libxml2 libzip boost lua luabind tbb expat];
 
   postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles";
 
@@ -26,6 +19,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/Project-OSRM/osrm-backend/wiki;
     description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project";
     license = stdenv.lib.licenses.bsd2;
+    maintainers = with stdenv.lib.maintainers;[ erictapen ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index 33c9489a70d..63b6cb66883 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb";
   };
 
-  sourceRoot = "${name}/X11";
+  # Note: don't change this to set sourceRoot, or updateAutotoolsGnuConfigScriptsHook
+  # on aarch64 doesn't find the files to patch and the aarch64 build fails!
+  preConfigure = "cd X11";
 
   buildInputs = [ libX11 xproto libXt libICE libSM libXext ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c478347d170..7b29f4f9fc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -830,10 +830,10 @@ with pkgs;
     enableSharedExecutables = false;
     executableToolDepends = [ makeWrapper ];
     postInstall = ''
-      exe=$libexec/bin/${drv.pname}-${drv.version}/${drv.pname}
-      install -D $bin/bin/${drv.pname} $exe
-      rm -rf $bin/bin $out/lib $out/share
-      makeWrapper $exe $bin/bin/${drv.pname} \
+      exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname}
+      install -D $out/bin/${drv.pname} $exe
+      rm -rf $out/{bin,lib,share}
+      makeWrapper $exe $out/bin/${drv.pname} \
         --prefix PATH ":" "${nix}/bin" \
         --prefix PATH ":" "${nix-prefetch-scripts}/bin"
       mkdir -p $out/share/{bash-completion/completions,zsh/vendor-completions,fish/completions}
@@ -847,7 +847,7 @@ with pkgs;
     executableToolDepends = [ makeWrapper ];
     postInstall = ''
       wrapProgram $out/bin/stack2nix \
-        ${lib.makeBinPath [ git cabal2nix cabal-install stack ]}
+        --prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin:${stack}/bin"
     '';
   });
 
@@ -1777,17 +1777,7 @@ with pkgs;
 
   dleyna-server = callPackage ../development/libraries/dleyna-server { };
 
-  dmd_2_067_1 = callPackage ../development/compilers/dmd/2.067.1.nix {
-    stdenv = if stdenv.hostPlatform.isDarwin then
-               stdenv
-             else
-               # Doesn't build with gcc6 on linux
-               overrideCC stdenv gcc5;
-  };
-
-  dmd = callPackage ../development/compilers/dmd {
-    bootstrapDmd = dmd_2_067_1;
-  };
+  dmd = callPackage ../development/compilers/dmd { };
 
   dmg2img = callPackage ../tools/misc/dmg2img { };
 
@@ -7279,7 +7269,7 @@ with pkgs;
   flow = callPackage ../development/tools/analysis/flow {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     inherit (darwin) cf-private;
-    inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild;
+    inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild ocaml_lwt;
   };
 
   framac = callPackage ../development/tools/analysis/frama-c { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d6dcc396b0..435613e8033 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -43,10 +43,10 @@ let
       overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs);
     in
       if builtins.isAttrs ff then (ff // {
-        overridePythonAttrs = newArgs: makeOverridable f (overrideWith newArgs);
+        overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs);
       })
       else if builtins.isFunction ff then {
-        overridePythonAttrs = newArgs: makeOverridable f (overrideWith newArgs);
+        overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs);
         __functor = self: ff;
       }
       else ff;