Merge branch 'master' into staging

2018-06-08 18:06:47 +02:00 · 2018-06-08 18:06:47 +02:00 · fcdcfe2de1
commit fcdcfe2de1
parent 9dfb0b2db0 b9565143ea
165 changed files with 2577 additions and 2052 deletions
--- a/doc/default.nix
+++ b/doc/default.nix
@ -44,5 +44,6 @@ pkgs.stdenv.mkDerivation {

    mkdir -p $out/nix-support/
    echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products
+    echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products
  '';
 }
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -562,6 +562,11 @@
    github = "basvandijk";
    name = "Bas van Dijk";
  };
+  bbarker = {
+    email = "brandon.barker@gmail.com";
+    github = "bbarker";
+    name = "Brandon Elam Barker";
+  };  
  bcarrell = {
    email = "brandoncarrell@gmail.com";
    github = "bcarrell";
@ -2176,6 +2181,11 @@
    github = "limeytexan";
    name = "Michael Brantley";
  };
+  linc01n = {
+    email = "git@lincoln.hk";
+    github = "linc01n";
+    name = "Lincoln Lee";
+  };
  linquize = {
    email = "linquize@yahoo.com.hk";
    github = "linquize";
@ -2289,6 +2299,11 @@
    github = "madjar";
    name = "Georges Dubus";
  };
+  mafo = {
+    email = "Marc.Fontaine@gmx.de";
+    github = "MarcFontaine";
+    name = "Marc Fontaine";
+  };
  magnetophon = {
    email = "bart@magnetophon.nl";
    github = "magnetophon";
@ -3950,6 +3965,11 @@
    github = "uralbash";
    name = "Svintsov Dmitry";
  };
+  uri-canva = {
+    email = "uri@canva.com";
+    github = "uri-canva";
+    name = "Uri Baghin";
+  };
  utdemir = {
    email = "me@utdemir.com";
    github = "utdemir";
--- a/nixos/doc/manual/configuration/linux-kernel.xml
+++ b/nixos/doc/manual/configuration/linux-kernel.xml
@ -66,6 +66,57 @@ nixpkgs.config.packageOverrides = pkgs:
  sets the kernel’s TCP keepalive time to 120 seconds. To see the available
  parameters, run <command>sysctl -a</command>.
 </para>
+ <section>
+  <title>Customize your kernel</title>
+
+  <para>
+   The first step before compiling the kernel is to generate an appropriate
+   <literal>.config</literal> configuration. Either you pass your own config via
+   the <literal>configfile</literal> setting of <literal>linuxManualConfig</literal>:
+  <screen><![CDATA[
+  custom-kernel = super.linuxManualConfig {
+    inherit (super) stdenv hostPlatform;
+    inherit (linux_4_9) src;
+    version = "${linux_4_9.version}-custom";
+
+    configfile = /home/me/my_kernel_config;
+    allowImportFromDerivation = true;
+  };
+  ]]></screen>
+
+You can edit the config with this snippet (by default <command>make menuconfig</command> won't work
+  out of the box on nixos):
+  <screen><![CDATA[
+      nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkgconfig ncurses ];})'
+  ]]></screen>
+
+
+  or you can let nixpkgs generate the configuration.
+  Nixpkgs generates it via answering the interactive kernel utility <command>make config</command>.
+  The answers depend on parameters passed to <filename>pkgs/os-specific/linux/kernel/generic.nix</filename>
+  (which you can influence by overriding <literal>extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig</literal>).
+<screen><![CDATA[
+
+  mptcp93.override ({
+      name="mptcp-local";
+
+      ignoreConfigErrors = true;
+      autoModules = false;
+      kernelPreferBuiltin = true;
+
+      enableParallelBuilding = true;
+
+      extraConfig = ''
+        DEBUG_KERNEL y
+        FRAME_POINTER y
+        KGDB y
+        KGDB_SERIAL_CONSOLE y
+        DEBUG_INFO y
+      '';
+    });
+  ]]></screen>
+  </para>
+ </section>
 <section>
  <title>Developing kernel modules</title>

--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@ -130,11 +130,13 @@ in
        default = false;
        description = "
          If set, Nix will perform builds in a sandboxed environment that it
-          will set up automatically for each build.  This prevents
-          impurities in builds by disallowing access to dependencies
-          outside of the Nix store. This isn't enabled by default for
-          performance. It doesn't affect derivation hashes, so changing
-          this option will not trigger a rebuild of packages.
+          will set up automatically for each build. This prevents impurities
+          in builds by disallowing access to dependencies outside of the Nix 
+          store by using network and mount namespaces in a chroot environment. 
+          This isn't enabled by default for possible performance impacts due to 
+          the initial setup time of a sandbox for each build. It doesn't affect 
+          derivation hashes, so changing this option will not trigger a rebuild
+          of packages.
        ";
      };

--- a/nixos/modules/services/web-servers/minio.nix
+++ b/nixos/modules/services/web-servers/minio.nix
@ -85,7 +85,7 @@ in
      '';
      serviceConfig = {
        PermissionsStartOnly = true;
-        ExecStart = "${cfg.package}/bin/minio server --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${cfg.dataDir}";
+        ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${cfg.dataDir}";
        Type = "simple";
        User = "minio";
        Group = "minio";
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@ -88,12 +88,14 @@ in rec {
        (all nixos.tests.env)
        (all nixos.tests.ipv6)
        (all nixos.tests.i3wm)
-        (all nixos.tests.keymap.azerty)
-        (all nixos.tests.keymap.colemak)
-        (all nixos.tests.keymap.dvorak)
-        (all nixos.tests.keymap.dvp)
-        (all nixos.tests.keymap.neo)
-        (all nixos.tests.keymap.qwertz)
+        # 2018-06-06: keymap tests temporarily removed from tested job
+        # since non-deterministic failure are blocking the channel (#41538)
+        #(all nixos.tests.keymap.azerty)
+        #(all nixos.tests.keymap.colemak)
+        #(all nixos.tests.keymap.dvorak)
+        #(all nixos.tests.keymap.dvp)
+        #(all nixos.tests.keymap.neo)
+        #(all nixos.tests.keymap.qwertz)
        (all nixos.tests.plasma5)
        #(all nixos.tests.lightdm)
        (all nixos.tests.login)
--- a/nixos/release.nix
+++ b/nixos/release.nix
@ -305,6 +305,7 @@ in rec {
  tests.home-assistant = callTest tests/home-assistant.nix { };
  tests.hound = callTest tests/hound.nix {};
  tests.hocker-fetchdocker = callTest tests/hocker-fetchdocker {};
+  tests.hydra = callTest tests/hydra {};
  tests.i3wm = callTest tests/i3wm.nix {};
  tests.iftop = callTest tests/iftop.nix {};
  tests.initrd-network-ssh = callTest tests/initrd-network-ssh {};
--- a/nixos/tests/hydra.nix
+++ b/nixos/tests/hydra.nix
@ -1,32 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "hydra-init-localdb";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ pstn ];
-  };
-
-  machine =
-    { config, pkgs, ... }:
-
-    {
-      services.hydra = {
-        enable = true;
-
-        #Hydra needs those settings to start up, so we add something not harmfull.
-        hydraURL = "example.com";
-        notificationSender = "example@example.com";
-      };
-    };
-
-  testScript =
-    ''
-      # let the system boot up
-      $machine->waitForUnit("multi-user.target");
-      # test whether the database is running
-      $machine->succeed("systemctl status postgresql.service");
-      # test whether the actual hydra daemons are running
-      $machine->succeed("systemctl status hydra-queue-runner.service");
-      $machine->succeed("systemctl status hydra-init.service");
-      $machine->succeed("systemctl status hydra-evaluator.service");
-      $machine->succeed("systemctl status hydra-send-stats.service");
-     '';
-})
--- a/nixos/tests/hydra/create-trivial-project.sh
+++ b/nixos/tests/hydra/create-trivial-project.sh
@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+#
+# This script creates a project, a jobset with an input of type local
+# path. This local path is a directory that contains a Nix expression
+# to define a job.
+# The EXPR-PATH environment variable must be set with the local path.
+
+set -e
+
+URL=http://localhost:3000
+USERNAME="admin"
+PASSWORD="admin"
+PROJECT_NAME="trivial"
+JOBSET_NAME="trivial"
+EXPR_PATH=${EXPR_PATH:-}
+
+if [ -z $EXPR_PATH ]; then
+   echo "Environment variable EXPR_PATH must be set"
+   exit 1
+fi
+
+mycurl() {
+  curl --referer $URL -H "Accept: application/json" -H "Content-Type: application/json" $@
+}
+
+cat >data.json <<EOF
+{ "username": "$USERNAME", "password": "$PASSWORD" }
+EOF
+mycurl -X POST -d '@data.json' $URL/login -c hydra-cookie.txt
+
+cat >data.json <<EOF
+{
+  "displayname":"Trivial",
+  "enabled":"1"
+}
+EOF
+mycurl --silent -X PUT $URL/project/$PROJECT_NAME -d @data.json -b hydra-cookie.txt
+
+cat >data.json <<EOF
+{
+  "description": "Trivial",
+  "checkinterval": "60",
+  "enabled": "1",
+  "visible": "1",
+  "keepnr": "1",
+  "nixexprinput": "trivial",
+  "nixexprpath": "trivial.nix",
+  "inputs": {
+    "trivial": {
+      "value": "$EXPR_PATH",
+      "type": "path"
+    }
+  }
+}
+EOF
+mycurl --silent -X PUT $URL/jobset/$PROJECT_NAME/$JOBSET_NAME -d @data.json -b hydra-cookie.txt
--- a/nixos/tests/hydra/default.nix
+++ b/nixos/tests/hydra/default.nix
@ -0,0 +1,78 @@
+import ../make-test.nix ({ pkgs, ...} :
+
+let
+   trivialJob = pkgs.writeTextDir "trivial.nix" ''
+     with import <nix/config.nix>;
+
+     { trivial = builtins.derivation {
+         name = "trivial";
+         system = "x86_64-linux";
+         PATH = coreutils;
+         builder = shell;
+         args = ["-c" "touch $out; exit 0"];
+       };
+     }
+   '';
+
+    createTrivialProject = pkgs.stdenv.mkDerivation {
+      name = "create-trivial-project";
+      unpackPhase = ":";
+      buildInputs = [ pkgs.makeWrapper ];
+      installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh";
+      postFixup = ''
+        wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}
+      '';
+    };
+
+in {
+  name = "hydra-init-localdb";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ pstn lewo ];
+  };
+
+  machine =
+    { config, pkgs, ... }:
+
+    {
+      virtualisation.memorySize = 1024;
+      time.timeZone = "UTC";
+
+      environment.systemPackages = [ createTrivialProject pkgs.jq ];
+      services.hydra = {
+        enable = true;
+
+        #Hydra needs those settings to start up, so we add something not harmfull.
+        hydraURL = "example.com";
+        notificationSender = "example@example.com";
+      };
+      nix = {
+        buildMachines = [{
+          hostName = "localhost";
+          systems = [ "x86_64-linux" ];
+        }];
+      };
+    };
+
+  testScript =
+    ''
+      # let the system boot up
+      $machine->waitForUnit("multi-user.target");
+      # test whether the database is running
+      $machine->succeed("systemctl status postgresql.service");
+      # test whether the actual hydra daemons are running
+      $machine->succeed("systemctl status hydra-queue-runner.service");
+      $machine->succeed("systemctl status hydra-init.service");
+      $machine->succeed("systemctl status hydra-evaluator.service");
+      $machine->succeed("systemctl status hydra-send-stats.service");
+
+      $machine->succeed("hydra-create-user admin --role admin --password admin");
+
+      # create a project with a trivial job
+      $machine->waitForOpenPort(3000);
+
+      # make sure the build as been successfully built
+      $machine->succeed("create-trivial-project.sh");
+
+      $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" |  jq .buildstatus | xargs test 0 -eq');
+     '';
+})
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@ -85,7 +85,6 @@ rec {
  };

  parity = callPackage ./parity { };
-  parity-beta = callPackage ./parity/beta.nix { };
  parity-ui = callPackage ./parity-ui { };

  particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; withGui = false; };
--- a/pkgs/applications/altcoins/parity/beta.nix
+++ b/pkgs/applications/altcoins/parity/beta.nix
@ -1,7 +0,0 @@
-let
-  version     = "1.10.2";
-  sha256      = "1a1rbwlwi60nfv6m1rdy5baq5lcafc8nw96y45pr1674i48gkp0l";
-  cargoSha256 = "0l3rjkinzppfq8fi8h24r35rb552fzzman5a6yk33wlsdj2lv7yh";
-  patches     = [ ./patches/vendored-sources-1.10.patch ];
-in
-  import ./parity.nix { inherit version sha256 cargoSha256 patches; }
--- a/pkgs/applications/altcoins/parity/default.nix
+++ b/pkgs/applications/altcoins/parity/default.nix
@ -1,7 +1,7 @@
 let
-  version     = "1.9.7";
-  sha256      = "1h9rmyqkdv2v83g12dadgqflq1n1qqgd5hrpy20ajha0qpbiv3ph";
-  cargoSha256 = "0ss5jw43850r8l34prai5vk1zd5d5fjyg4rcav1asbq6v683bww0";
-  patches     = [ ./patches/vendored-sources-1.9.patch ];
+  version     = "1.10.6";
+  sha256      = "1x2sm262z8fdkx8zin6r8nwbb7znziw9nm224pr6ap3p0jmv7fcq";
+  cargoSha256 = "1wf1lh32f9dlhv810gdcssv92g1yximx09lw63m0mxcjbn9813bs";
+  patches     = [ ./patches/vendored-sources-1.10.patch ];
 in
  import ./parity.nix { inherit version sha256 cargoSha256 patches; }
--- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
+++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
@ -1,101 +0,0 @@
-diff --git a/.cargo/config b/.cargo/config
-new file mode 100644
-index 000000000..0efb69724
--- /dev/null 
-+++ b/.cargo/config
-@@ -0,0 +1,94 @@
-+[source."https://github.com/alexcrichton/mio-named-pipes"]
-+git = "https://github.com/alexcrichton/mio-named-pipes"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"]
-+git = "https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"]
-+git = "https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/nikvolf/parity-tokio-ipc"]
-+git = "https://github.com/nikvolf/parity-tokio-ipc"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/nikvolf/tokio-named-pipes"]
-+git = "https://github.com/nikvolf/tokio-named-pipes"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/app-dirs-rs"]
-+git = "https://github.com/paritytech/app-dirs-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/bn"]
-+git = "https://github.com/paritytech/bn"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/hidapi-rs"]
-+git = "https://github.com/paritytech/hidapi-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/hyper"]
-+git = "https://github.com/paritytech/hyper"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/jsonrpc.git"]
-+git = "https://github.com/paritytech/jsonrpc.git"
-+branch = "parity-1.9"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/libusb-rs"]
-+git = "https://github.com/paritytech/libusb-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/libusb-sys"]
-+git = "https://github.com/paritytech/libusb-sys"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-ctrlc.git"]
-+git = "https://github.com/paritytech/rust-ctrlc.git"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-rocksdb"]
-+git = "https://github.com/paritytech/rust-rocksdb"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-secp256k1"]
-+git = "https://github.com/paritytech/rust-secp256k1"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-snappy"]
-+git = "https://github.com/paritytech/rust-snappy"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/trezor-sys"]
-+git = "https://github.com/paritytech/trezor-sys"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/tailhook/rotor"]
-+git = "https://github.com/tailhook/rotor"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/tomusdrw/ws-rs"]
-+git = "https://github.com/tomusdrw/ws-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
--- a/pkgs/applications/audio/midas/generic.nix
+++ b/pkgs/applications/audio/midas/generic.nix
@ -0,0 +1,43 @@
+{ stdenv, fetchurl, lib, libX11, libXext, alsaLib, freetype, brand, type, version, homepage, sha256, ... }:
+stdenv.mkDerivation rec {
+  inherit type;
+  baseName = "${type}-Edit";
+  name = "${lib.toLower baseName}-${version}";
+
+  src = fetchurl {
+    url = "http://downloads.music-group.com/software/behringer/${type}/${type}-Edit_LINUX_64bit_${version}.tar.gz";
+    inherit sha256;
+  };
+
+  sourceRoot = ".";
+  dontBuild = true;
+  dontStrip = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${baseName} $out/bin
+  '';
+  preFixup = let
+    # we prepare our library path in the let clause to avoid it become part of the input of mkDerivation
+    libPath = lib.makeLibraryPath [
+      libX11           # libX11.so.6
+      libXext          # libXext.so.6
+      alsaLib          # libasound.so.2
+      freetype         # libfreetype.so.6
+      stdenv.cc.cc.lib # libstdc++.so.6
+    ];
+  in ''
+    patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${libPath}" \
+      $out/bin/${baseName}
+  '';
+
+  meta = with stdenv.lib; {
+    inherit homepage;
+    description = "Editor for the ${brand} ${type} digital mixer";
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.magnetophon ];
+  };
+}
--- a/pkgs/applications/audio/midas/m32edit.nix
+++ b/pkgs/applications/audio/midas/m32edit.nix
@ -0,0 +1,9 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  brand = "Midas";
+  type = "M32";
+  version = "3.2";
+  sha256 = "1cds6qinz37086l6pmmgrzrxadygjr2z96sjjyznnai2wz4z2nrd";
+  homepage = http://www.musictri.be/Categories/Midas/Mixers/Digital/M32/p/P0B3I/downloads;
+})
--- a/pkgs/applications/audio/midas/x32edit.nix
+++ b/pkgs/applications/audio/midas/x32edit.nix
@ -0,0 +1,9 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  brand = "Behringer";
+  type = "X32";
+  version = "3.2";
+  sha256 = "1lzmhd0sqnlzc0khpwm82sfi48qhv7rg153a57qjih7hhhy41mzk";
+  homepage = http://www.musictri.be/Categories/Behringer/Mixers/Digital/X32/p/P0ASF/downloads;
+})
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@ -29,11 +29,11 @@
 # handle that.

 stdenv.mkDerivation rec {
-  name = "qmmp-1.2.1";
+  name = "qmmp-1.2.2";

  src = fetchurl {
    url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "1ag8wh11dq394zjqdyz5g1srjnm4fnq4cwlhpb9k89gpmlk42cdr";
+    sha256 = "01nnyg8m3p3px1fj3lfsqqv9zh1388dwx1bm2qv4v87jywimgp79";
  };

  buildInputs =
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@ -9,7 +9,7 @@
 let optionals = stdenv.lib.optionals; in
 python3.pkgs.buildPythonApplication rec {
  name = "quodlibet${tag}-${version}";
-  version = "4.0.2";
+  version = "4.1.0";

  # XXX, tests fail
  # https://github.com/quodlibet/quodlibet/issues/2820
@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {

  src = fetchurl {
    url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz";
-    sha256 = "072s983p3n84yl807pbdxsy5vrgs8jzzfl648gsri6kpwsp6w5fz";
+    sha256 = "1vcxx4sz5i4ag74pjpdfw7jkwxfb8jhvn8igcjwd5cccw4gscm2z";
  };

  nativeBuildInputs = [ wrapGAppsHook gettext intltool ];
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@ -8,14 +8,14 @@ let
    inherit (gnome2) GConf gnome_vfs;
  };
  stableVersion = {
-    version = "3.1.2.0"; # "Android Studio 3.1.2"
-    build = "173.4720617";
-    sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk";
+    version = "3.1.3.0"; # "Android Studio 3.1.3"
+    build = "173.4819257";
+    sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq";
  };
  latestVersion = {
-    version = "3.2.0.15"; # "Android Studio 3.2 Canary 16"
-    build = "181.4802120";
-    sha256Hash = "0ch9jjq58k83dpnq65xyxchyik24w3fmh2v9q3kx1s028iavmpym";
+    version = "3.2.0.16"; # "Android Studio 3.2 Canary 17"
+    build = "181.4823740";
+    sha256Hash = "04282zd28kn2a4rjsi0ikx4bc9ab668xm7cc87ga60pzyg5gmmgk";
  };
 in rec {
  # Old alias
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@ -63,7 +63,7 @@ in stdenv.lib.mapAttrs common {
  };

  atom-beta = {
-    version = "1.28.0-beta2";
-    sha256 = "0fc9j1l776hv057dirw2bv9wmvhcaba5c4nq1cgs5rb5whxir2n6";
+    version = "1.28.0-beta3";
+    sha256 = "07mmzkbc7xzcwh6ylrs2w1g3l5gmyfk0gdmr2kzr6jdr00cq73y0";
  };
 }
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@ -1,5 +1,7 @@
 { stdenv, fetchFromGitHub, emacs, texinfo }:

+# Use "emacsMelpa.haskell-mode" instead.
+
 let
  version = "13.14-169-g0d3569d";      # git describe --tags
 in
@ -35,5 +37,6 @@ stdenv.mkDerivation {

    platforms = stdenv.lib.platforms.unix;
    maintainers = [ stdenv.lib.maintainers.peti ];
+    broken = true;  # no longer compiles and this package is obsolete anyway
  };
 }
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@ -237,12 +237,12 @@ in

  clion = buildClion rec {
    name = "clion-${version}";
-    version = "2018.1.2"; /* updated by script */
+    version = "2018.1.3";
    description  = "C/C++ IDE. New. Intelligent. Cross-platform";
    license = stdenv.lib.licenses.unfree;
    src = fetchurl {
      url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "158ydbr0bbzm1nqi4xhrcp6bwk7kmiw78v959h7bxg3y7z55hbwa"; /* updated by script */
+      sha256 = "0daj1ha7d9kxgb60mx2yzyj01m6ahw5d6wzs0vvwp5fh5qf4mpw5";
    };
    wmClass = "jetbrains-clion";
    update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@ -2,7 +2,7 @@
  makeWrapper, libXScrnSaver, libxkbfile, libsecret }:

 let
-  version = "1.23.1";
+  version = "1.24.0";
  channel = "stable";

  plat = {
@ -12,9 +12,9 @@ let
  }.${stdenv.system};

  sha256 = {
-    "i686-linux" = "0vqaxyg6r6mfm1gz8j7wxgg426hjsmv2ybyi8rfjcm9s8d23y9n6";
-    "x86_64-linux" = "0zycl8zqf5yiqq6k6mr28a20yg37whb8iw527pavvm74knzx3lgk";
-    "x86_64-darwin" = "03r2cvim7swq1fjxh6m9f7rifww3hddnyzpzniqb5132nnq4mrmc";
+    "i686-linux" = "17dvyp31kf12mfs6z3cm8rxfrvrmbrk9gbsk3z7v284z64dry9vz";
+    "x86_64-linux" = "11m50lb0hvnmvb3qdixgpvdzcljzm94qxl41240g4qh4a36qvr1j";
+    "x86_64-darwin" = "1wm6h3f8b33rky5nlrvwx4qx0k9h72aabiz6sm27x1wrs486p3lf";
  }.${stdenv.system};

  archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg,
-  pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobjectIntrospection, hicolor-icon-theme
+, gdk_pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:

 let
  inherit (python2Packages) python pycairo pygobject3 numpy;
@ -15,9 +15,14 @@ in stdenv.mkDerivation rec {
    fetchSubmodules = true;
  };

-  nativeBuildInputs = [ intltool pkgconfig scons swig wrapGAppsHook ];
+  nativeBuildInputs = [
+    intltool pkgconfig scons swig wrapGAppsHook
+    gobjectIntrospection # for setup hook
+  ];

-  buildInputs = [ gtk3 json_c lcms2 libpng librsvg pycairo pygobject3 python ];
+  buildInputs = [
+    gtk3 gdk_pixbuf json_c lcms2 libpng librsvg pycairo pygobject3 python hicolor-icon-theme
+  ];

  propagatedBuildInputs = [ numpy ];

--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@ -98,12 +98,12 @@ let

  flash = stdenv.mkDerivation rec {
    name = "flashplayer-ppapi-${version}";
-    version = "29.0.0.171";
+    version = "30.0.0.113";

    src = fetchzip {
      url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
          + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "1j7w81wjfrpkir11m719jdahnbnw4sph448hs90hvai6rsn3imib";
+      sha256 = "0bcsrsz2dd12xs9vn2977k4s6hag1cknkrsgxz3c9pxk4jz99f3k";
      stripRoot = false;
    };

--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@ -73,25 +73,25 @@ let
 in
 stdenv.mkDerivation rec {
  name = "flashplayer-${version}";
-  version = "29.0.0.171";
+  version = "30.0.0.113";

  src = fetchurl {
    url =
      if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_npapi_linux_debug.${arch}.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_npapi_linux_debug.${arch}.tar.gz"
      else
        "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
    sha256 =
      if debug then
        if arch == "x86_64" then
-          "140galarr38lmfnd2chl2msvxizx96kdi000gbikir9xnd7bx1hc"
+          "1s4i9lmlydm8b373pi8jw5xf3fhcq75fgqyp7xd7aava8hay7x0j"
        else
-          "0wzmf12xrmyq8vqqyii932yx4nadrvkn2j9s86xcw67lb40xj5ig"
+          "1jhzvrn6f9zcynx3zq0vxidaps946aymm7l16c42p1f7q9s8msb4"
      else
        if arch == "x86_64" then
-          "17c57xgs0w71p4xsjw5an7dg484769wanq3kx86ppaqw8vqhnqc3"
+          "05dv4cn9i3zz5fmy16dxs9m1rpvlaih4gzsrf0q1zfjn46jbyw2l"
        else
-          "06pjbc9050fgi2njzf9vm6py7c22i6chw852rbm8flx3cmplw23b";
+          "0pn159rzx6nb6lmkghccl0ynnc9ihfbr4rvfp14gm4n6jzbl6vg8";
  };

  nativeBuildInputs = [ unzip ];
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@ -55,19 +55,19 @@ let
 in
 stdenv.mkDerivation rec {
  name = "flashplayer-standalone-${version}";
-  version = "29.0.0.171";
+  version = "30.0.0.113";

  src = fetchurl {
    url =
      if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux_debug.x86_64.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux_debug.x86_64.tar.gz"
      else
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz";
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz";
    sha256 =
      if debug then
-        "1q2lmsb9g2cxbwxb712javmadk6vmcgkihd244394nr10isdzw67"
+        "0vdzmk9l04jq9mfkdddsqrga7ndikq910indl7wa3vndghrahmn0"
      else
-        "0qj5qdc9k53pgqxb5jpcbgfsgavmlyzp0cpz468c4zacsvxgq502";
+        "10rm48i3h6x1dygjivv2mvd0jq6n40j5c2ik090s7i0ily5z97m8";
  };

  nativeBuildInputs = [ unzip ];
--- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
@ -0,0 +1,36 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }:
+
+buildGoPackage rec {
+  pname = "docker-machine-kvm2";
+  name = "${pname}-${version}";
+  version = "0.27.0";
+
+  goPackagePath = "k8s.io/minikube";
+  subPackages = [ "cmd/drivers/kvm" ];
+
+  src = fetchFromGitHub {
+    owner = "kubernetes";
+    repo = "minikube";
+    rev = "v${version}";
+    sha256 = "00gj8x5p0vxwy0y0g5nnddmq049h7zxvhb73lb4gii5mghr9mkws";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libvirt ];
+
+  preBuild = ''
+    export buildFlagsArray=(-ldflags="-X k8s.io/minikube/pkg/drivers/kvm/version.VERSION=v${version}")
+  '';
+
+  postInstall = ''
+    mv $bin/bin/kvm $bin/bin/docker-machine-driver-kvm2
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/kubernetes/minikube/blob/master/docs/drivers.md;
+    description = "KVM2 driver for docker-machine.";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ tadfisher ];
+    platforms = platforms.unix;
+  };
+}
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@ -2,11 +2,11 @@
 , geoip, gperftools, python, swig }:

 stdenv.mkDerivation rec {
-  name = "bro-2.5.3";
+  name = "bro-2.5.4";

  src = fetchurl {
    url = "http://www.bro.org/downloads/${name}.tar.gz";
-    sha256 = "09b227j1c0ggihbhbyphd7lnh26mpz07z1s0h148dg6fwqagm13k";
+    sha256 = "07sz1i4ly30257677b8vfrbsvxhz2awijyzn5ihg4m567x1ymnl0";
  };

  nativeBuildInputs = [ cmake flex bison file ];
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@ -50,13 +50,13 @@ let
 in
 stdenv.mkDerivation rec {
  name = "nheko-${version}";
-  version = "0.4.2";
+  version = "0.4.3";

  src = fetchFromGitHub {
    owner = "mujx";
    repo = "nheko";
    rev = "v${version}";
-    sha256 = "1z9dbvcgwafxr131a8447qkx97x8l93k32xa8xvajgvjlimqphqk";
+    sha256 = "0qjia42nam3hj835k2jb5b6j6n56rdkb8rn67yqf45xdz8ypmbmv";
  };

  # This patch is likely not strictly speaking needed, but will help detect when
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@ -1,6 +1,6 @@
 { stdenv, fetchurl, dpkg, makeWrapper
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3
-, gtk2, libnotify, libpulseaudio, libsecret, libstdcxx5, libv4l, nspr, nss, pango, systemd, xorg }:
+, gtk2, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }:

 let

@ -25,7 +25,7 @@ let
    gnome3.gconf
    gdk_pixbuf
    gtk2
-    
+

    gnome3.gnome-keyring

@ -36,7 +36,6 @@ let
    pango
    stdenv.cc.cc
    systemd
-    libstdcxx5
    libv4l

    xorg.libxkbfile
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@ -14,7 +14,7 @@ in {
  stable = mkTelegram stableVersion;
  preview = mkTelegram (stableVersion // {
    stable = false;
-    version = "1.3.1";
-    sha256Hash = "084zrdx3w1yq53r53zjbqpz7s8fc3ga26ffwyfxj07ysmyn7ck25";
+    version = "1.3.4";
+    sha256Hash = "17xdzyl7jb5g69a2h6fyk67z7s6h2dqjg8j478px6n0br1n420wk";
  });
 }
--- a/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch
+++ b/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch
@ -0,0 +1,157 @@
+Date: Wed, 6 Jun 2018 20:46:38 +0200
+
+This reverts commit eceda92a16f1f4e5c5b584acd745398571df2bd6.
+---
+ src/application/mainapplication.cpp |  3 ---
+ src/application/mainwindow.cpp      | 11 -----------
+ src/application/mainwindow.h        |  2 --
+ src/newstabwidget.cpp               |  6 +-----
+ src/newstabwidget.h                 |  2 +-
+ src/optionsdialog.cpp               |  2 --
+ src/webview/webpage.cpp             | 13 +------------
+ src/webview/webpage.h               |  3 ---
+ 8 files changed, 3 insertions(+), 39 deletions(-)
+
+diff --git a/src/application/mainapplication.cpp b/src/application/mainapplication.cpp
+index e93ec9c1..a5913bdf 100644
+--- a/src/application/mainapplication.cpp
+++ b/src/application/mainapplication.cpp
+@@ -566,9 +566,6 @@ void MainApplication::c2fLoadSettings()
+   settings.beginGroup("ClickToFlash");
+   c2fWhitelist_ = settings.value("whitelist", QStringList()).toStringList();
+   c2fEnabled_ = settings.value("enabled", true).toBool();
+-#if QT_VERSION >= 0x050900
+-  c2fEnabled_ = false;
+-#endif
+   settings.endGroup();
+ }
+ 
+diff --git a/src/application/mainwindow.cpp b/src/application/mainwindow.cpp
+index 337a7c4e..42255d2c 100644
+--- a/src/application/mainwindow.cpp
+++ b/src/application/mainwindow.cpp
+@@ -8140,14 +8140,3 @@ void MainWindow::createBackup()
+     QFile::copy(settings.fileName(), backupFileName);
+   }
+ }
+-
+-void MainWindow::webViewFullScreen(bool on)
+-{
+-  setFullScreen();
+-  feedsWidget_->setVisible(!on);
+-  pushButtonNull_->setVisible(!on);
+-  tabBarWidget_->setVisible(!on);
+-  currentNewsTab->newsWidget_->setVisible(!on);
+-  pushButtonNull_->setVisible(!on);
+-  statusBar()->setVisible(!on);
+-}
+diff --git a/src/application/mainwindow.h b/src/application/mainwindow.h
+index 995f96dc..93b75c11 100644
+--- a/src/application/mainwindow.h
+++ b/src/application/mainwindow.h
+@@ -271,8 +271,6 @@ public:
+ 
+   AdBlockIcon *adBlockIcon() { return adblockIcon_; }
+ 
+-  void webViewFullScreen(bool on);
+-
+ public slots:
+   void restoreFeedsOnStartUp();
+   void addFeed();
+diff --git a/src/newstabwidget.cpp b/src/newstabwidget.cpp
+index 77d74d3b..c6c130f7 100644
+--- a/src/newstabwidget.cpp
+++ b/src/newstabwidget.cpp
+@@ -1842,12 +1842,8 @@ void NewsTabWidget::loadNewspaper(int refresh)
+  *----------------------------------------------------------------------------*/
+ void NewsTabWidget::slotSetHtmlWebView(const QString &html, const QUrl &baseUrl)
+ {
+-  QUrl url = baseUrl;
+-#if QT_VERSION >= 0x050900
+-  url.setScheme("");
+-#endif
+   webView_->history()->setMaximumItemCount(0);
+-  webView_->setHtml(html, url);
+  webView_->setHtml(html, baseUrl);
+   webView_->history()->setMaximumItemCount(100);
+ }
+ 
+diff --git a/src/newstabwidget.h b/src/newstabwidget.h
+index 7f5c3957..8d1266ac 100644
+--- a/src/newstabwidget.h
+++ b/src/newstabwidget.h
+@@ -127,7 +127,6 @@ public:
+   QToolBar *newsToolBar_;
+   QSplitter *newsTabWidgetSplitter_;
+ 
+-  QWidget *newsWidget_;
+   WebView *webView_;
+   QToolBar *webToolBar_;
+   LocationBar *locationBar_;
+@@ -199,6 +198,7 @@ private:
+ 
+   MainWindow *mainWindow_;
+   QSqlDatabase db_;
+  QWidget *newsWidget_;
+ 
+   FeedsModel *feedsModel_;
+   FeedsProxyModel *feedsProxyModel_;
+diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp
+index 73136dec..c082bc30 100644
+--- a/src/optionsdialog.cpp
+++ b/src/optionsdialog.cpp
+@@ -741,9 +741,7 @@ void OptionsDialog::createBrowserWidget()
+   browserWidget_ = new QTabWidget();
+   browserWidget_->addTab(generalBrowserWidget, tr("General"));
+   browserWidget_->addTab(historyBrowserWidget_, tr("History"));
+-#if QT_VERSION < 0x050900
+   browserWidget_->addTab(click2FlashWidget_, tr("Click to Flash"));
+-#endif
+   browserWidget_->addTab(downloadsWidget, tr("Downloads"));
+ }
+ 
+diff --git a/src/webview/webpage.cpp b/src/webview/webpage.cpp
+index 6401ec87..0254a167 100644
+--- a/src/webview/webpage.cpp
+++ b/src/webview/webpage.cpp
+@@ -51,10 +51,7 @@ WebPage::WebPage(QObject *parent)
+           this, SLOT(downloadRequested(QNetworkRequest)));
+   connect(this, SIGNAL(printRequested(QWebFrame*)),
+           mainApp->mainWindow(), SLOT(slotPrint(QWebFrame*)));
+-#if QT_VERSION >= 0x050900
+-  connect(this, SIGNAL(fullScreenRequested(QWebFullScreenRequest)),
+-          this, SLOT(slotFullScreenRequested(QWebFullScreenRequest)));
+-#endif
+
+   livingPages_.append(this);
+ }
+ 
+@@ -286,11 +283,3 @@ void WebPage::cleanBlockedObjects()
+     mainFrame()->scrollToAnchor(mainFrame()->url().fragment());
+   }
+ }
+-
+-#if QT_VERSION >= 0x050900
+-void WebPage::slotFullScreenRequested(QWebFullScreenRequest fullScreenRequest)
+-{
+-  fullScreenRequest.accept();
+-  mainApp->mainWindow()->webViewFullScreen(fullScreenRequest.toggleOn());
+-}
+-#endif
+diff --git a/src/webview/webpage.h b/src/webview/webpage.h
+index 5c376c50..91e72758 100644
+--- a/src/webview/webpage.h
+++ b/src/webview/webpage.h
+@@ -68,9 +68,6 @@ private slots:
+   void downloadRequested(const QNetworkRequest &request);
+   void cleanBlockedObjects();
+   void urlChanged(const QUrl &url);
+-#if QT_VERSION >= 0x050900
+-  void slotFullScreenRequested(QWebFullScreenRequest fullScreenRequest);
+-#endif
+ 
+ private:
+   NetworkManagerProxy *networkManagerProxy_;
+-- 
+2.16.2
+
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@ -1,17 +1,24 @@
-{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, pkgconfig, sqlite }:
+{ stdenv, fetchFromGitHub, qmake, pkgconfig
+, qtbase, qttools, qtwebkit, sqlite
+}:

 stdenv.mkDerivation rec {
  name = "quiterss-${version}";
-  version = "0.18.10";
+  version = "0.18.11";

  src = fetchFromGitHub {
    owner = "QuiteRSS";
    repo = "quiterss";
    rev = "${version}";
-    sha256 = "1bv5aw6fscrwlycirvzm6fvbwmg8lbd1ycldkwbvybhjyfjaxkpm";
+    sha256 = "0n9byhibi2qpgrb7x08knvqnmyn5c7vm24cl6y3zcvz52pz8y2yc";
  };

-  nativeBuildInputs = [ pkgconfig qmake ];
+  # Revert this commit until qt5.qtwebkit (currently an older version) from
+  # nixpkgs supports it (the commit states WebKit 602.1 while the current
+  # version in nixos-unstable is 538.1)
+  patches = [ ./0001-Revert-change-WebKit-602.1-c2f.patch ];
+
+  nativeBuildInputs = [ qmake pkgconfig ];
  buildInputs = [ qtbase qttools qtwebkit sqlite.dev ];

  meta = with stdenv.lib; {
--- a/pkgs/applications/science/astronomy/xearth/default.nix
+++ b/pkgs/applications/science/astronomy/xearth/default.nix
@ -0,0 +1,32 @@
+{ stdenv, fetchurl, xorg }:
+stdenv.mkDerivation rec {
+  name = "xearth-${version}";
+  version = "1.1";
+  
+  src = fetchurl {
+    url = "http://xearth.org/${name}.tar.gz";
+    sha256 = "bcb1407cc35b3f6dd3606b2c6072273b6a912cbd9ed1ae22fb2d26694541309c";
+  };
+
+  buildInputs = with xorg; [  imake libXt libXext ];
+
+  dontAddPrefix = true;
+  configureScript="xmkmf";
+
+  installFlags=[ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"];
+  installTargets="install install.man";
+  
+  meta = with stdenv.lib; {
+    description = "sets the X root window to an image of the Earth";
+    homepage = "http://xplanet.org";
+    longDescription =
+      '' Xearth  sets  the X root window to an image of the Earth, as seen from your favorite vantage point in space,
+         correctly shaded for the current position of the Sun.
+	 By default, xearth updates the displayed image every  five  minutes.
+      '';
+    maintainers = [ maintainers.mafo ];
+    license = "xearth";
+    platforms=platforms.unix;
+  };
+
+}
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "gtkwave-${version}";
-  version = "3.3.90";
+  version = "3.3.91";

  src = fetchurl {
    url    = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "1q1fi0nqja9d8xj24h7ykvnpms6zqgn24jmyj1mxn48qig301c6m";
+    sha256 = "1vp9qj3wyfwm36jk3pajvi09xvc1m1crf3d4gphfbs6nkyx2z942";
  };

  nativeBuildInputs = [ pkgconfig ];
--- a/pkgs/applications/science/logic/cryptoverif/default.nix
+++ b/pkgs/applications/science/logic/cryptoverif/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "cryptoverif-${version}";
-  version = "1.28";
+  version = "2.00";

  src = fetchurl {
    url    = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz";
-    sha256 = "0vssz751g1nn8wclkiwgghpm475jl00xkivc164vgbr9acxsr7n7";
+    sha256 = "0g8pkj58b48zk4c0sgpln0qhbj82v75mz3w6cl3w5bvmxsbkwvy1";
  };

  buildInputs = [ ocaml ];
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "z3-${version}";
-  version = "4.6.0";
+  version = "4.7.1";

  src = fetchFromGitHub {
    owner  = "Z3Prover";
    repo   = "z3";
-    rev    = "b0aaa4c6d7a739eb5e8e56a73e0486df46483222";
-    sha256 = "1cgwlmjdbf4rsv2rriqi2sdpz9qxihxrcpm6a4s37ijy437xg78l";
+    rev    = "3b1b82bef05a1b5fd69ece79c80a95fb6d72a990";
+    sha256 = "1s850r6qifwl83zzgvrb5l0jigvmymzpv18ph71hg2bcpk7kjw3d";
  };

  buildInputs = [ python fixDarwinDylibNames ];
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@ -2,12 +2,12 @@

 stdenv.mkDerivation rec {
  name = "hub-${version}";
-  version = "2.3.0";
+  version = "2.4.0";

  src = fetchgit {
    url = https://github.com/github/hub.git;
    rev = "refs/tags/v${version}";
-    sha256 = "0rx5izxgjxh4jdn991x90xvgbc7nhwx15pkmmzc8rkdzf0hnas1s";
+    sha256 = "1lr6vg0zhg2air9bnzcl811g97jraxq05l3cs46wqqflwy57xpz2";
  };


--- a/pkgs/applications/video/obs-studio/linuxbrowser.nix
+++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix
@ -0,0 +1,48 @@
+# We don't have a wrapper which can supply obs-studio plugins so you have to
+# somewhat manually install this:
+
+# nix-env -f . -iA obs-linuxbrowser
+# mkdir -p ~/.config/obs-studio/plugins
+# ln -s ~/.nix-profile/share/obs/obs-plugins/obs-linuxbrowser ~/.config/obs-studio/plugins/
+
+{ stdenv, fetchFromGitHub, obs-studio, cmake, libcef
+}:
+
+stdenv.mkDerivation rec {
+  name = "obs-linuxbrowser-${version}";
+  version = "0.3.1";
+  src = fetchFromGitHub {
+    owner = "bazukas";
+    repo = "obs-linuxbrowser";
+    rev = version;
+    sha256 = "0dql7wxyhksqa08j1dn5d09v2jwhgywc1p7psifhhvh97rkp4z7j";
+  };
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ obs-studio ];
+  postUnpack = ''
+    mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/
+    for i in ${libcef}/share/cef/*; do
+      ln -s $i cef/Release/
+      ln -s $i cef/Resources/
+    done
+    ln -s ${libcef}/lib/libcef.so cef/Release/
+    ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/
+    ln -s ${libcef}/include cef/
+  '';
+  cmakeFlags = [
+    "-DCEF_DIR=../../cef"
+    "-DOBS_INCLUDE=${obs-studio}/include/obs"
+  ];
+  installPhase = ''
+    mkdir -p $out/share/obs/obs-plugins
+    cp -r build/obs-linuxbrowser $out/share/obs/obs-plugins/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Browser source plugin for obs-studio based on Chromium Embedded Framework";
+    homepage = https://github.com/bazukas/obs-linuxbrowser;
+    maintainers = with maintainers; [ puffnfresh ];
+    license = licenses.gpl2;
+    platforms = with platforms; linux;
+  };
+}
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/pkgs/applications/window-managers/openbox/default.nix
@ -6,22 +6,26 @@ stdenv.mkDerivation rec {
  name = "openbox-${version}";
  version = "3.6.1";

-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    libxml2
-    libXinerama libXcursor libXau libXrandr libICE libSM
-    libstartup_notification makeWrapper
+  nativeBuildInputs = [
+    pkgconfig
+    makeWrapper
    python2.pkgs.wrapPython
  ];

-  pythonPath = with python2.pkgs; [
-    pyxdg
+  buildInputs = [
+    libxml2
+    libXinerama libXcursor libXau libXrandr libICE libSM
+    libstartup_notification
  ];

  propagatedBuildInputs = [
    pango imlib2
  ];

+  pythonPath = with python2.pkgs; [
+    pyxdg
+  ];
+
  src = fetchurl {
    url = "http://openbox.org/dist/openbox/${name}.tar.gz";
    sha256 = "1xvyvqxlhy08n61rjkckmrzah2si1i7nmc7s8h07riqq01vc0jlb";
@ -41,7 +45,7 @@ stdenv.mkDerivation rec {
    wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share"
    wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share"
    wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share"
-    wrapPythonPrograms
+    wrapPythonProgramsIn "$out/libexec" "$out $pythonPath"
  '';

  meta = {
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh
@ -15,6 +15,7 @@ findElfs() {
        while [ -n "$1" ]; do
            mimeType="$(file -b -N --mime-type "$1")"
            if [ "$mimeType" = application/x-executable \
+              -o "$mimeType" = application/x-pie-executable \
              -o "$mimeType" = application/x-sharedlib ]; then
                echo "$1"
            fi
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@ -2,16 +2,16 @@

 stdenv.mkDerivation rec {
  name = "unifont-${version}";
-  version = "10.0.06";
+  version = "11.0.01";

  ttf = fetchurl {
    url = "mirror://gnu/unifont/${name}/${name}.ttf";
-    sha256 = "1h4scl4l6503n8ghzd35dxfbai773csjrgdziqm86334zdj9g6k6";
+    sha256 = "03nnfnh4j60a4hy0d4hqpnvhlfx437hp4g1wjfjy91vzrcbmvkwi";
  };

  pcf = fetchurl {
    url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
-    sha256 = "0ypkmwyfrsnag69h1c0mx89ranz4f6jc9y1sqkpq2rbzg64maik0";
+    sha256 = "03bqqz2ipy3afhwsfy30c2v97cc27grw11lc0vzcvrgvin9ys2v1";
  };

  nativeBuildInputs = [ mkfontscale mkfontdir ];
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

  outputHashAlgo = "sha256";
  outputHashMode = "recursive";
-  outputHash = "1qz7qr6lrwcn47vn0hbbgqnhz3agdl7q7x4l4yd5ard0idv3jj98";
+  outputHash = "1ncllq42x1mlblf6h44garc3b5hkxv9dkpgbaipzll22p1l29yrf";

  meta = with stdenv.lib; {
    description = "Unicode font for Base Multilingual Plane";
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@ -6,11 +6,11 @@

 stdenv.mkDerivation rec {
  name = "epiphany-${version}";
-  version = "3.28.1.1";
+  version = "3.28.2.1";

  src = fetchurl {
    url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "15d4dr4dwb1dyw3mvs7wp5gik57kdg0rxdc49n92wx46wfh6lhlr";
+    sha256 = "0ba0qqsbg3cv1k1pcj971y7l8kqib5l7kbr743x9a7hbmkqfk95s";
  };

  # Tests need an X display
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@ -5,11 +5,11 @@

 stdenv.mkDerivation rec {
  name = "gdm-${version}";
-  version = "3.28.1";
+  version = "3.28.2";

  src = fetchurl {
    url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1yxjjyrp0ywrc25cp81bsdhp79zn0c0jag48hlp00b5wfnkqy1kp";
+    sha256 = "0wdm1503x66n1crdlmzmincbd2hccpxsdgjsl5anx3yjpdzs0hb0";
  };

  # Only needed to make it build
--- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
+++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "geocode-glib-${version}";
-  version = "3.25.4.1";
+  version = "3.26.0";

  outputs = [ "out" "dev" "installedTests" ];

  src = fetchurl {
    url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0y6p5l2jrr78p7l4hijjhclzbap005y6h06g3aiglg9i5hk6j0gi";
+    sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a";
  };

  nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobjectIntrospection ];
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@ -9,13 +9,13 @@

 let
  pname = "gnome-control-center";
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
  name = "${pname}-${version}";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0f2p91bzbl39q3cb1qj5vi55km7wxb2fibx07vciz39g5va5cpn6";
+    sha256 = "0d6pjdbsra16nav8201kaadja5yma92bhziki9601ilk2ry3v7pz";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@ -5,11 +5,11 @@

 stdenv.mkDerivation rec {
  name = "gnome-disk-utility-${version}";
-  version = "3.28.2";
+  version = "3.28.3";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1j3l4b1prbnixzy6srvcsjfg1dx5nqys2lmygm31ygfdq7svp3m6";
+    sha256 = "11ajz4cbsdns81kihd6242b6pwxbw8bkr9qqkf4qnb4kp363a38m";
  };

  passthru = {
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@ -4,11 +4,11 @@

 stdenv.mkDerivation rec {
  name = "gnome-terminal-${version}";
-  version = "3.28.1";
+  version = "3.28.2";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-terminal/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1hqwh12hiy73mazqgvyrq8jk4c669x2fb4nh8mwby3qbk8ca19pp";
+    sha256 = "0ybjansg6lr279191w8z8r45gy4rxwzw1ajm98cgkv0fk2jdr0x2";
  };

  passthru = {
--- a/pkgs/desktops/gnome-3/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/core/vte/default.nix
@ -5,11 +5,11 @@

 stdenv.mkDerivation rec {
  name = "vte-${version}";
-  version = "0.52.1";
+  version = "0.52.2";

  src = fetchurl {
    url = "mirror://gnome/sources/vte/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1lva70inb5y8p42rg95fb88z2ybwcz0lybla3ixbgp2sj0s4rzdh";
+    sha256 = "1br6kg0wzf1wmww1hadihhcpqbamalqmbppfdzjvzk1ayp75f9hg";
  };

  passthru = {
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@ -3,11 +3,11 @@
 , withContrib ? true }:

 let
-  versionPkg = "0.3.9" ;
+  versionPkg = "0.3.11" ;

  contrib = fetchurl {
    url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
-    sha256 = "627bb99ecf2e3d5976f95f2faa13c7c330726601e8bb05a2113c9b69c98749b5";
+    sha256 = "300884eca8a54cb9b0daa19bd04a86252160cc8ad6ef494198babd56d5a579bc";
  };

  postInstallContrib = stdenv.lib.optionalString withContrib
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "c69a7c58964df26227e77656659129ca4c05205d2ebcacc7084edba818fb6e81";
+    sha256 = "feba71f37e9688b8ff0a72c4eb21914ce59f19421350d9dc3f15ad6f8c28428a";
  };

  buildInputs = [ gmp ];
@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
    homepage    = "http://www.ats-lang.org";
    license     = licenses.gpl3Plus;
    platforms   = platforms.linux;
-    maintainers = with maintainers; [ thoughtpolice ttuegel ];
+    maintainers = with maintainers; [ thoughtpolice ttuegel bbarker ];
  };
 }
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@ -151,35 +151,35 @@ let

 in {

-  cudatoolkit6 = common {
+  cudatoolkit_6 = common {
    version = "6.0.37";
    url = "http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run";
    sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40";
    gcc = gcc48;
  };

-  cudatoolkit65 = common {
+  cudatoolkit_6_5 = common {
    version = "6.5.19";
    url = "http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run";
    sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj";
    gcc = gcc48;
  };

-  cudatoolkit7 = common {
+  cudatoolkit_7 = common {
    version = "7.0.28";
    url = "http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run";
    sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi";
    gcc = gcc49;
  };

-  cudatoolkit75 = common {
+  cudatoolkit_7_5 = common {
    version = "7.5.18";
    url = "http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run";
    sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88";
    gcc = gcc49;
  };

-  cudatoolkit8 = common {
+  cudatoolkit_8 = common {
    version = "8.0.61.2";
    url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run";
    sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w";
@ -192,7 +192,14 @@ in {
    gcc = gcc5;
  };

-  cudatoolkit9 = common {
+  cudatoolkit_9_0 = common {
+    version = "9.0.176.1";
+    url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run";
+    sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln";
+    gcc = gcc6;
+  };
+
+  cudatoolkit_9 = common {
    version = "9.1.85.1";
    url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux";
    sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4";
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@ -7,13 +7,13 @@

 let drv = stdenv.mkDerivation rec {
  pname = "jetbrainsjdk";
-  version = "152b1136.20";
+  version = "152b1248.6";
  name = pname + "-" + version;

  src = if stdenv.system == "x86_64-linux" then
    fetchurl {
      url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbsdk8u${version}_linux_x64.tar.gz";
-      sha256 = "0sqr8f3z062kwcxh3dxnan45ldas438blbc69z0pypbhc8c2sk2b";
+      sha256 = "12l81g8zhaymh4rzyfl9nyzmpkgzc7wrphm3j4plxx129yn9i7d7";
    }
  else
    throw "unsupported system: ${stdenv.system}";
--- a/pkgs/development/compilers/mint/default.nix
+++ b/pkgs/development/compilers/mint/default.nix
@ -28,13 +28,13 @@ let
  };
 in
 stdenv.mkDerivation rec {
-  version = "2018-05-27";
+  version = "0.0.3";
  name = "mint-${version}";
  src = fetchFromGitHub {
    owner = "mint-lang";
    repo = "mint";
-    rev = "a3f0c86f54b8b3a18dda5c39c2089bdb1d774b4f";
-    sha256 = "1bgs6jkwfc2ksq4gj55cl3h2l5g25f5bwlsjryiw9cbx5k4bp1kz";
+    rev = "0.0.3";
+    sha256 = "15aawhpagpaqrs64jnz3g6iw3dhq0rlqm92cvfd5a3hbwvxg7lm0";
  };

  buildInputs = [ crystal zlib openssl duktape ];
--- a/pkgs/development/compilers/owl-lisp/default.nix
+++ b/pkgs/development/compilers/owl-lisp/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name    = "owl-lisp-${version}";
-  version = "0.1.15";
+  version = "0.1.16";

  src = fetchFromGitHub {
    owner  = "aoh";
    repo   = "owl-lisp";
    rev    = "v${version}";
-    sha256 = "0pczmra2x6icyz6b6g66pp5ij83cq4wszg0ssw8qm7a5314kxkq4";
+    sha256 = "1qp6p48bmlyn83rqi6k3d098dg4cribavg5rd4x17z37i181vxvj";
  };

  nativeBuildInputs = [ which ];
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@ -3,13 +3,13 @@

 stdenv.mkDerivation ( rec {
  name = "ponyc-${version}";
-  version = "0.22.5";
+  version = "0.22.6";

  src = fetchFromGitHub {
    owner = "ponylang";
    repo = "ponyc";
    rev = version;
-    sha256 = "1kxn4chc35h72hrblfrmmwgzb9s1sjsjazwz1dksj3hy45288lj1";
+    sha256 = "05y0qcfdyzv6cgizhbg6yl7rrlbfbkcr0jmxjlzhvhz7dypk20cl";
  };

  buildInputs = [ llvm makeWrapper which ];
--- a/pkgs/development/compilers/rust/binaryBuild.nix
+++ b/pkgs/development/compilers/rust/binaryBuild.nix
@ -14,7 +14,7 @@ let

  installComponents
    = "rustc,rust-std-${platform}"
-    + (optionalString bootstrapping ",rust-docs,cargo")
+    + (optionalString bootstrapping ",cargo")
    ;
 in

--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@ -3,16 +3,16 @@
 let
  # Note: the version MUST be one version prior to the version we're
  # building
-  version = "1.24.1";
+  version = "1.26.1";

  # fetch hashes by running `print-hashes.sh 1.24.1`
  hashes = {
-    i686-unknown-linux-gnu = "a483576bb2ab237aa1ef62b66c0814f934afd8129d7c9748cb9a75da4a678c98";
-    x86_64-unknown-linux-gnu = "4567e7f6e5e0be96e9a5a7f5149b5452828ab6a386099caca7931544f45d5327";
-    armv7-unknown-linux-gnueabihf = "1169ab005b771c4befcdab536347a90242cae544b6b76eccd0f76796b61a534c";
-    aarch64-unknown-linux-gnu = "64bb25a9689b18ddadf025b90d9bdb150b809ebfb74432dc69cc2e46120adbb2";
-    i686-apple-darwin = "c96f7579e2406220895da80a989daaa194751c141e112ebe95761f2ed4ecb662";
-    x86_64-apple-darwin = "9d4aacdb5849977ea619d399903c9378163bd9c76ea11dac5ef6eca27849f501";
+    i686-unknown-linux-gnu = "d704ba5cbaaf93c5e2112d211630db0e460d5dc819a43464ba91581e5c821df3";
+    x86_64-unknown-linux-gnu = "b7e964bace1286696d511c287b945f3ece476ba77a231f0c31f1867dfa5080e0";
+    armv7-unknown-linux-gnueabihf = "34fbcebc8e60b6496f1ce7998cf0b50cd618770f039da529b65110fff1f25fa0";
+    aarch64-unknown-linux-gnu = "d4a369053c2dfd5f457de6853557dab563944579fa4bb55bc919bacf259bff6d";
+    i686-apple-darwin = "047c31a872161ebb1d21ef616f7658190403769a8734f84364a3cf15838b4708";
+    x86_64-apple-darwin = "ebf898b9fa7e2aafc53682a41f18af5ca6660ebe82dd78f28cd9799fe4dc189a";
  };

  platform =
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@ -6,16 +6,25 @@

 let
  rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
-  version = "1.25.0";
-  cargoVersion = "0.26.0";
+  version = "1.26.2";
+  cargoVersion = "1.26.2";
  src = fetchurl {
    url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-    sha256 = "0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf";
+    sha256 = "0047ais0fvmqvngqkdsxgrzhb0kljg8wy85b01kbbjc88hqcz7pv";
  };
 in rec {
  rustc = callPackage ./rustc.nix {
    inherit stdenv llvm targets targetPatches targetToolchains rustPlatform version src;

+    patches = [
+      ./patches/net-tcp-disable-tests.patch
+      ./patches/stdsimd-disable-doctest.patch
+      # Fails on hydra - not locally; the exact reason is unknown.
+      # Comments in the test suggest that some non-reproducible environment
+      # variables such $RANDOM can make it fail.
+      ./patches/disable-test-inherit-env.patch
+    ];
+
    forceBundledLLVM = true;

    configureFlags = [ "--release-channel=stable" ];
@ -25,11 +34,6 @@ in rec {
    # So we do the same.
    # 2. Tests run out of memory for i686
    doCheck = !stdenv.isAarch64 && !stdenv.isi686;
-
-    patches = [
-      ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
-    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-
  };

  cargo = callPackage ./cargo.nix rec {
--- a/pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
+++ b/pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
@ -1,53 +0,0 @@
-From 26d3b70abec1adf773522643b31ce9c03439916a Mon Sep 17 00:00:00 2001
-From: Joerg Thalheim <joerg@thalheim.io>
-Date: Tue, 10 Oct 2017 00:40:20 +0100
-Subject: [PATCH] Disable fragile tests libstd::net::tcp on Darwin/Linux
-
-Signed-off-by: Joerg Thalheim <joerg@thalheim.io>
---
- src/libstd/net/tcp.rs | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
-index 8d1e7882e5..2c223fb315 100644
--- a/src/libstd/net/tcp.rs
-+++ b/src/libstd/net/tcp.rs
-@@ -949,6 +949,7 @@ mod tests {
-         })
-     }
- 
-+    #[cfg_attr(target_os = "macos", ignore)]
-     #[test]
-     fn write_close() {
-         each_ip(&mut |addr| {
-@@ -1421,7 +1422,10 @@ mod tests {
- 
-     // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
-     //        no longer has rounding errors.
-    #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)]
-+    #[cfg_attr(any(target_os = "bitrig",
-+                   target_os = "netbsd",
-+                   target_os = "openbsd",
-+                   target_os = "macos"), ignore)]
-     #[test]
-     fn timeouts() {
-         let addr = next_test_ip4();
-@@ -1500,6 +1504,7 @@ mod tests {
-         assert_eq!(false, t!(stream.nodelay()));
-     }
- 
-+    #[cfg_attr(target_os = "macos", ignore)]
-     #[test]
-     fn ttl() {
-         let ttl = 100;
-@@ -1568,6 +1573,7 @@ mod tests {
-         })
-     }
- 
-+    #[cfg_attr(target_os = "linux", ignore)]
-     #[test]
-     fn connect_timeout_unroutable() {
-         // this IP is unroutable, so connections should always time out,
-- 
-2.14.2
-
--- a/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch
+++ b/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch
@ -0,0 +1,10 @@
+--- rustc-1.26.2-src.org/src/libstd/process.rs	2018-06-01 21:40:11.000000000 +0100
+++ rustc-1.26.2-src/src/libstd/process.rs	2018-06-08 07:50:23.023828658 +0100
+@@ -1745,6 +1745,7 @@
+     }
+ 
+     #[test]
+    #[ignore]
+     fn test_inherit_env() {
+         use env;
+ 
--- a/pkgs/development/compilers/rust/patches/grsec.patch
+++ b/pkgs/development/compilers/rust/patches/grsec.patch
@ -1,24 +0,0 @@
-diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile
-index b22f34f..c6489bd 100644
--- a/src/test/run-make/relocation-model/Makefile
-+++ b/src/test/run-make/relocation-model/Makefile
-@@ -2,9 +2,11 @@
- 
- all: others
- 	$(RUSTC) -C relocation-model=dynamic-no-pic foo.rs
-+	paxctl -czexm $(TMPDIR)/foo
- 	$(call RUN,foo)
- 
- 	$(RUSTC) -C relocation-model=default foo.rs
-+	paxctl -czexm $(TMPDIR)/foo
- 	$(call RUN,foo)
- 
- 	$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs
-@@ -16,6 +18,7 @@ others:
- else
- others:
- 	$(RUSTC) -C relocation-model=static foo.rs
-+	paxctl -czexm $(TMPDIR)/foo
- 	$(call RUN,foo)
- 	$(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs
- endif
--- a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
+++ b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
@ -0,0 +1,104 @@
+diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
+index 0f60b5b3e..9b08415e7 100644
+--- a/src/libstd/net/tcp.rs
+++ b/src/libstd/net/tcp.rs
+@@ -962,6 +962,7 @@ mod tests {
+         }
+     }
+ 
+    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn listen_localhost() {
+         let socket_addr = next_test_ip4();
+@@ -1020,6 +1021,7 @@ mod tests {
+         })
+     }
+ 
+    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn read_eof() {
+         each_ip(&mut |addr| {
+@@ -1039,6 +1041,7 @@ mod tests {
+         })
+     }
+ 
+    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn write_close() {
+         each_ip(&mut |addr| {
+@@ -1065,6 +1068,7 @@ mod tests {
+         })
+     }
+ 
+    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn multiple_connect_serial() {
+         each_ip(&mut |addr| {
+@@ -1087,6 +1091,7 @@ mod tests {
+         })
+     }
+ 
+    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn multiple_connect_interleaved_greedy_schedule() {
+         const MAX: usize = 10;
+@@ -1123,6 +1128,7 @@ mod tests {
+     }
+ 
+     #[test]
+    #[cfg_attr(target_os = "macos", ignore)]
+     fn multiple_connect_interleaved_lazy_schedule() {
+         const MAX: usize = 10;
+         each_ip(&mut |addr| {
+@@ -1401,6 +1407,7 @@ mod tests {
+     }
+ 
+     #[test]
+    #[cfg_attr(target_os = "macos", ignore)]
+     fn clone_while_reading() {
+         each_ip(&mut |addr| {
+             let accept = t!(TcpListener::bind(&addr));
+@@ -1421,7 +1422,10 @@ mod tests {
+ 
+     // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
+     //        no longer has rounding errors.
+-    #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)]
+    #[cfg_attr(any(target_os = "bitrig",
+                   target_os = "netbsd",
+                   target_os = "openbsd",
+                   target_os = "macos"), ignore)]
+     #[test]
+     fn timeouts() {
+         let addr = next_test_ip4();
+@@ -1596,6 +1603,7 @@ mod tests {
+         drop(listener);
+     }
+ 
+    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn nodelay() {
+         let addr = next_test_ip4();
+@@ -1610,6 +1618,7 @@ mod tests {
+         assert_eq!(false, t!(stream.nodelay()));
+     }
+ 
+    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn ttl() {
+         let ttl = 100;
+@@ -1647,6 +1656,7 @@ mod tests {
+         }
+     }
+ 
+    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn peek() {
+         each_ip(&mut |addr| {
+@@ -1679,6 +1689,7 @@ mod tests {
+     }
+ 
+     #[test]
+    #[cfg_attr(any(target_os = "linux", target_os = "macos"), ignore)]
+     fn connect_timeout_unroutable() {
+         // this IP is unroutable, so connections should always time out,
+         // provided the network is reachable to begin with.
--- a/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch
+++ b/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch
@ -0,0 +1,20 @@
+diff --git a/src/stdsimd/coresimd/x86/mod.rs b/src/stdsimd/coresimd/x86/mod.rs
+index 32915c332..7cb54f31e 100644
+--- a/src/stdsimd/coresimd/x86/mod.rs
+++ b/src/stdsimd/coresimd/x86/mod.rs
+@@ -279,7 +279,6 @@ types! {
+     ///
+     /// # Examples
+     ///
+-    /// ```
+     /// # #![feature(cfg_target_feature, target_feature, stdsimd)]
+     /// # #![cfg_attr(not(dox), no_std)]
+     /// # #[cfg(not(dox))]
+@@ -301,7 +300,6 @@ types! {
+     /// # }
+     /// # if is_x86_feature_detected!("sse") { unsafe { foo() } }
+     /// # }
+-    /// ```
+     pub struct __m256(f32, f32, f32, f32, f32, f32, f32, f32);
+ 
+     /// 256-bit wide set of four `f64` types, x86-specific
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@ -10,11 +10,7 @@
 , targets
 , targetPatches
 , targetToolchains
-
-# Tests frequently break on Darwin
-# See the rust issue: https://github.com/rust-lang/rust/issues/51006
-, doCheck ? (!stdenv.isDarwin)
-
+, doCheck ? true
 , broken ? false
 , buildPlatform, hostPlatform
 } @ args:
@ -149,10 +145,11 @@ stdenv.mkDerivation {
  outputs = [ "out" "man" "doc" ];
  setOutputFlags = false;

-  # Disable codegen units for the tests.
+  # Disable codegen units and hardening for the tests.
  preCheck = ''
    export RUSTFLAGS=
    export TZDIR=${tzdata}/share/zoneinfo
+    export hardeningDisable=all
  '' +
  # Ensure TMPDIR is set, and disable a test that removing the HOME
  # variable from the environment falls back to another home
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -342,6 +342,7 @@ self: super: {
  HTF = dontCheck super.HTF;
  htsn = dontCheck super.htsn;
  htsn-import = dontCheck super.htsn-import;
+  http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105
  ihaskell = dontCheck super.ihaskell;
  influxdb = dontCheck super.influxdb;
  itanium-abi = dontCheck super.itanium-abi;
@ -437,12 +438,6 @@ self: super: {
  # https://github.com/evanrinehart/mikmod/issues/1
  mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;

-  # Version 0.21.2 calls its doctest suite with incorrect paths.
-  haskell-gi = appendPatch super.haskell-gi (pkgs.fetchpatch {
-    url = https://github.com/haskell-gi/haskell-gi/pull/163/commits/b876c4f351893370d4ae597aab6ecc0422e7f665.patch;
-    sha256 = "03vzpvnr3vnz2zgsr504iyf0n9aw6mkz8rkj6zhazfixl3dzfkyd";
-  });
-
  # https://github.com/basvandijk/threads/issues/10
  threads = dontCheck super.threads;

--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@ -38,7 +38,7 @@ core-packages:
  - ghcjs-base-0

 default-package-overrides:
-  # LTS Haskell 11.11
+  # LTS Haskell 11.12
  - abstract-deque ==0.3
  - abstract-deque-tests ==0.3
  - abstract-par ==0.3.3
@ -79,7 +79,7 @@ default-package-overrides:
  - aeson-yak ==0.1.1.3
  - Agda ==2.5.3
  - airship ==0.9.3
-  - alarmclock ==0.4.0.3
+  - alarmclock ==0.4.0.4
  - alerts ==0.1.0.0
  - alex ==3.2.4
  - algebra ==4.3.1
@ -91,6 +91,95 @@ default-package-overrides:
  - alternative-vector ==0.0.0
  - alternators ==0.1.2.0
  - ALUT ==2.4.0.2
+  - amazonka ==1.6.0
+  - amazonka-apigateway ==1.6.0
+  - amazonka-application-autoscaling ==1.6.0
+  - amazonka-appstream ==1.6.0
+  - amazonka-autoscaling ==1.6.0
+  - amazonka-budgets ==1.6.0
+  - amazonka-certificatemanager ==1.6.0
+  - amazonka-cloudformation ==1.6.0
+  - amazonka-cloudfront ==1.6.0
+  - amazonka-cloudhsm ==1.6.0
+  - amazonka-cloudsearch ==1.6.0
+  - amazonka-cloudsearch-domains ==1.6.0
+  - amazonka-cloudtrail ==1.6.0
+  - amazonka-cloudwatch ==1.6.0
+  - amazonka-cloudwatch-events ==1.6.0
+  - amazonka-cloudwatch-logs ==1.6.0
+  - amazonka-codebuild ==1.6.0
+  - amazonka-codecommit ==1.6.0
+  - amazonka-codedeploy ==1.6.0
+  - amazonka-codepipeline ==1.6.0
+  - amazonka-cognito-identity ==1.6.0
+  - amazonka-cognito-idp ==1.6.0
+  - amazonka-cognito-sync ==1.6.0
+  - amazonka-config ==1.6.0
+  - amazonka-core ==1.6.0
+  - amazonka-datapipeline ==1.6.0
+  - amazonka-devicefarm ==1.6.0
+  - amazonka-directconnect ==1.6.0
+  - amazonka-discovery ==1.6.0
+  - amazonka-dms ==1.6.0
+  - amazonka-ds ==1.6.0
+  - amazonka-dynamodb ==1.6.0
+  - amazonka-dynamodb-streams ==1.6.0
+  - amazonka-ec2 ==1.6.0
+  - amazonka-ecr ==1.6.0
+  - amazonka-ecs ==1.6.0
+  - amazonka-efs ==1.6.0
+  - amazonka-elasticache ==1.6.0
+  - amazonka-elasticbeanstalk ==1.6.0
+  - amazonka-elasticsearch ==1.6.0
+  - amazonka-elastictranscoder ==1.6.0
+  - amazonka-elb ==1.6.0
+  - amazonka-elbv2 ==1.6.0
+  - amazonka-emr ==1.6.0
+  - amazonka-gamelift ==1.6.0
+  - amazonka-glacier ==1.6.0
+  - amazonka-health ==1.6.0
+  - amazonka-iam ==1.6.0
+  - amazonka-importexport ==1.6.0
+  - amazonka-inspector ==1.6.0
+  - amazonka-iot ==1.6.0
+  - amazonka-iot-dataplane ==1.6.0
+  - amazonka-kinesis ==1.6.0
+  - amazonka-kinesis-analytics ==1.6.0
+  - amazonka-kinesis-firehose ==1.6.0
+  - amazonka-kms ==1.6.0
+  - amazonka-lambda ==1.6.0
+  - amazonka-lightsail ==1.6.0
+  - amazonka-marketplace-analytics ==1.6.0
+  - amazonka-marketplace-metering ==1.6.0
+  - amazonka-ml ==1.6.0
+  - amazonka-opsworks ==1.6.0
+  - amazonka-opsworks-cm ==1.6.0
+  - amazonka-pinpoint ==1.6.0
+  - amazonka-polly ==1.6.0
+  - amazonka-rds ==1.6.0
+  - amazonka-redshift ==1.6.0
+  - amazonka-rekognition ==1.6.0
+  - amazonka-route53 ==1.6.0
+  - amazonka-route53-domains ==1.6.0
+  - amazonka-s3 ==1.6.0
+  - amazonka-sdb ==1.6.0
+  - amazonka-servicecatalog ==1.6.0
+  - amazonka-ses ==1.6.0
+  - amazonka-shield ==1.6.0
+  - amazonka-sms ==1.6.0
+  - amazonka-snowball ==1.6.0
+  - amazonka-sns ==1.6.0
+  - amazonka-sqs ==1.6.0
+  - amazonka-ssm ==1.6.0
+  - amazonka-stepfunctions ==1.6.0
+  - amazonka-storagegateway ==1.6.0
+  - amazonka-sts ==1.6.0
+  - amazonka-support ==1.6.0
+  - amazonka-swf ==1.6.0
+  - amazonka-test ==1.6.0
+  - amazonka-waf ==1.6.0
+  - amazonka-workspaces ==1.6.0
+  - amazonka-xray ==1.6.0
  - amqp ==0.18.1
  - annotated-wl-pprint ==0.7.0
  - ansigraph ==0.3.0.5
@ -140,9 +229,9 @@ default-package-overrides:
  - auto-update ==0.1.4
  - avwx ==0.3.0.2
  - axiom ==0.4.6
-  - b9 ==0.5.47
+  - b9 ==0.5.49
  - backprop ==0.1.5.2
-  - bank-holidays-england ==0.1.0.6
+  - bank-holidays-england ==0.1.0.7
  - barrier ==0.1.1
  - base16-bytestring ==0.1.1.6
  - base32string ==0.9.1
@ -159,13 +248,13 @@ default-package-overrides:
  - bcrypt ==0.0.11
  - beam-core ==0.7.2.1
  - beam-migrate ==0.3.2.0
-  - beam-sqlite ==0.3.2.0
+  - beam-sqlite ==0.3.2.1
  - bench ==1.0.9
  - benchpress ==0.2.2.10
  - bencode ==0.6.0.0
  - bento ==0.1.0
  - between ==0.11.0.0
-  - bhoogle ==0.1.2.6
+  - bhoogle ==0.1.2.7
  - bibtex ==0.1.0.6
  - bifunctors ==5.5.2
  - bimap ==0.3.3
@ -179,7 +268,7 @@ default-package-overrides:
  - binary-parsers ==0.2.3.0
  - binary-search ==1.0.0.3
  - binary-shared ==0.8.3
-  - binary-tagged ==0.1.4.2
+  - binary-tagged ==0.1.5
  - bindings-DSL ==1.0.25
  - bindings-GLFW ==3.1.2.4
  - bindings-libzip ==1.0.1
@ -260,7 +349,7 @@ default-package-overrides:
  - Cabal ==2.0.1.1
  - cabal-doctest ==1.0.6
  - cabal-file-th ==0.2.4
-  - cabal-rpm ==0.12.3
+  - cabal-rpm ==0.12.4
  - cabal-toolkit ==0.0.5
  - cache ==0.1.1.0
  - cairo ==0.13.5.0
@ -286,7 +375,7 @@ default-package-overrides:
  - cereal-vector ==0.2.0.1
  - ChannelT ==0.0.0.7
  - charset ==0.3.7.1
-  - charsetdetect-ae ==1.1.0.3
+  - charsetdetect-ae ==1.1.0.4
  - Chart ==1.8.3
  - Chart-cairo ==1.8.3
  - chaselev-deque ==0.5.0.5
@ -357,7 +446,7 @@ default-package-overrides:
  - concurrent-supply ==0.1.8
  - cond ==0.4.1.1
  - conduit ==1.3.0.2
-  - conduit-algorithms ==0.0.8.0
+  - conduit-algorithms ==0.0.8.1
  - conduit-combinators ==1.3.0
  - conduit-connection ==0.1.0.4
  - conduit-extra ==1.3.0
@ -515,7 +604,7 @@ default-package-overrides:
  - dlist ==0.8.0.4
  - dlist-instances ==0.1.1.1
  - dlist-nonempty ==0.1.1
-  - dns ==3.0.3
+  - dns ==3.0.4
  - docker ==0.5.1.1
  - docker-build-cacher ==1.9.2
  - dockerfile ==0.1.0.1
@ -589,11 +678,11 @@ default-package-overrides:
  - eventful-sqlite ==0.2.0
  - eventful-test-helpers ==0.2.0
  - event-list ==0.1.2
-  - eventsource-api ==1.3.0
+  - eventsource-api ==1.3.1
  - eventsource-geteventstore-store ==1.1.0
  - eventsource-store-specs ==1.1.1
  - eventsource-stub-store ==1.0.3
-  - eventstore ==1.1.3
+  - eventstore ==1.1.4
  - every ==0.0.1
  - exact-combinatorics ==0.2.0.8
  - exact-pi ==0.4.1.3
@ -610,7 +699,7 @@ default-package-overrides:
  - extensible ==0.4.9
  - extensible-effects ==2.4.0.0
  - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.6
+  - extra ==1.6.8
  - extractable-singleton ==0.0.1
  - extrapolate ==0.3.1
  - fail ==4.9.0.0
@ -800,12 +889,12 @@ default-package-overrides:
  - haddock-library ==1.4.5
  - hailgun ==0.4.1.8
  - hailgun-simple ==0.1.0.0
-  - hakyll ==4.12.2.0
+  - hakyll ==4.12.3.0
  - half ==0.2.2.3
  - hamilton ==0.1.0.2
  - HandsomeSoup ==0.4.2
  - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.5
+  - hapistrano ==0.3.5.6
  - happstack-jmacro ==7.0.12
  - happstack-server ==7.5.1
  - happstack-server-tls ==7.1.6.5
@ -815,9 +904,9 @@ default-package-overrides:
  - hashable-time ==0.2.0.1
  - hashids ==1.0.2.4
  - hashmap ==1.3.3
-  - hashtables ==1.2.3.0
+  - hashtables ==1.2.3.1
  - haskeline ==0.7.4.2
-  - haskell-gi ==0.21.2
+  - haskell-gi ==0.21.3
  - haskell-gi-base ==0.21.1
  - haskell-gi-overloading ==0.0
  - haskell-lexer ==1.0.1
@ -841,9 +930,9 @@ default-package-overrides:
  - hasmin ==1.0.2
  - hasql ==1.1.1
  - hasql-migration ==0.1.3
-  - hasql-optparse-applicative ==0.3.0.1
-  - hasql-pool ==0.4.3
-  - hasql-transaction ==0.6
+  - hasql-optparse-applicative ==0.3.0.2
+  - hasql-pool ==0.4.3.1
+  - hasql-transaction ==0.6.0.1
  - hastache ==0.6.1
  - hasty-hamiltonian ==1.3.2
  - HaTeX ==3.18.0.0
@ -864,7 +953,7 @@ default-package-overrides:
  - hebrew-time ==0.1.1
  - hedgehog ==0.5.3
  - hedgehog-quickcheck ==0.1
-  - hedis ==0.10.1
+  - hedis ==0.10.2
  - heist ==1.0.1.2
  - here ==1.2.13
  - heredoc ==0.2.0.0
@ -944,7 +1033,7 @@ default-package-overrides:
  - hslua-module-text ==0.1.2.1
  - hsndfile ==0.8.0
  - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.4.13
+  - HsOpenSSL ==0.11.4.14
  - HsOpenSSL-x509-system ==0.1.0.3
  - hsp ==0.10.0
  - hspec ==2.4.8
@ -969,7 +1058,7 @@ default-package-overrides:
  - hstatsd ==0.1
  - HStringTemplate ==0.8.7
  - HSvm ==0.1.0.3.22
-  - hsx-jmacro ==7.3.8
+  - hsx-jmacro ==7.3.8.1
  - hsyslog ==5.0.1
  - hsyslog-udp ==0.2.2
  - htaglib ==1.1.1
@ -1005,9 +1094,9 @@ default-package-overrides:
  - hweblib ==0.6.3
  - hw-excess ==0.2.0.0
  - hw-fingertree ==0.1.0.1
-  - hw-fingertree-strict ==0.1.0.3
+  - hw-fingertree-strict ==0.1.1.1
  - hw-hedgehog ==0.1.0.1
-  - hw-hspec-hedgehog ==0.1.0.4
+  - hw-hspec-hedgehog ==0.1.0.5
  - hw-int ==0.0.0.3
  - hw-json ==0.6.0.0
  - hw-mquery ==0.1.0.1
@ -1280,12 +1369,12 @@ default-package-overrides:
  - microstache ==1.0.1.1
  - midi ==0.2.2.2
  - mighty-metropolis ==1.2.0
-  - milena ==0.5.2.1
+  - milena ==0.5.2.2
  - mime-mail ==0.4.14
  - mime-mail-ses ==0.4.1
  - mime-types ==0.1.0.7
  - minimorph ==0.1.6.1
-  - minio-hs ==1.0.0
+  - minio-hs ==1.0.1
  - miniutter ==0.4.7.0
  - mintty ==0.1.2
  - misfortune ==0.1.1.2
@ -1329,7 +1418,7 @@ default-package-overrides:
  - monadplus ==1.4.2
  - monad-products ==4.0.1
  - MonadPrompt ==1.0.0.5
-  - MonadRandom ==0.5.1
+  - MonadRandom ==0.5.1.1
  - monad-recorder ==0.1.1
  - monad-skeleton ==0.1.5
  - monad-st ==0.2.4.1
@ -1353,7 +1442,7 @@ default-package-overrides:
  - multiarg ==0.30.0.10
  - multimap ==1.2.1
  - multipart ==0.1.2
-  - multiset ==0.3.3
+  - multiset ==0.3.4
  - multistate ==0.7.1.2
  - murmur-hash ==0.1.0.9
  - mustache ==2.3.0
@ -1367,7 +1456,7 @@ default-package-overrides:
  - mysql-haskell-openssl ==0.8.3.0
  - mysql-simple ==0.4.5
  - nagios-check ==0.3.2
-  - names-th ==0.2.0.3
+  - names-th ==0.2.0.4
  - nano-erl ==0.1.0.1
  - nanospec ==0.2.2
  - naqsha ==0.2.0.1
@ -1565,8 +1654,8 @@ default-package-overrides:
  - postgresql-binary ==0.12.1.1
  - postgresql-libpq ==0.9.4.1
  - postgresql-schema ==0.1.14
-  - postgresql-simple ==0.5.3.0
-  - postgresql-simple-migration ==0.1.11.0
+  - postgresql-simple ==0.5.4.0
+  - postgresql-simple-migration ==0.1.12.0
  - postgresql-simple-queue ==1.0.1
  - postgresql-simple-url ==0.2.1.0
  - postgresql-transactional ==1.1.1
@ -1609,10 +1698,10 @@ default-package-overrides:
  - prometheus-metrics-ghc ==0.3.0
  - promises ==0.3
  - prompt ==0.1.1.2
-  - protobuf ==0.2.1.1
+  - protobuf ==0.2.1.2
  - protobuf-simple ==0.1.0.5
-  - protocol-buffers ==2.4.9
-  - protocol-buffers-descriptor ==2.4.9
+  - protocol-buffers ==2.4.10
+  - protocol-buffers-descriptor ==2.4.10
  - protocol-radius ==0.0.1.0
  - protocol-radius-test ==0.0.1.0
  - proto-lens ==0.2.2.0
@ -1660,7 +1749,7 @@ default-package-overrides:
  - random-shuffle ==0.0.4
  - random-source ==0.3.0.6
  - random-tree ==0.6.0.5
-  - range-set-list ==0.1.2.1
+  - range-set-list ==0.1.3
  - rank1dynamic ==0.4.0
  - rank2classes ==1.0.2
  - rank-product ==0.2.0.1
@ -1755,8 +1844,8 @@ default-package-overrides:
  - say ==0.1.0.0
  - sbp ==2.3.16
  - sbv ==7.5
-  - SCalendar ==1.1.0
  - scalendar ==1.2.0
+  - SCalendar ==1.1.0
  - scalpel ==0.5.1
  - scalpel-core ==0.5.1
  - scanner ==0.2
@ -1837,7 +1926,7 @@ default-package-overrides:
  - signal ==0.1.0.4
  - silently ==1.2.5
  - simple ==0.11.2
-  - simple-log ==0.9.4
+  - simple-log ==0.9.5
  - simple-reflect ==0.3.3
  - simple-sendfile ==0.2.27
  - simple-session ==0.10.1.1
@ -1892,7 +1981,7 @@ default-package-overrides:
  - spoon ==0.3.1
  - spreadsheet ==0.1.3.7
  - sqlite-simple ==0.4.15.0
-  - sql-words ==0.1.6.0
+  - sql-words ==0.1.6.1
  - squeal-postgresql ==0.1.1.4
  - srcloc ==0.5.1.2
  - stache ==1.2.1
@ -1924,7 +2013,7 @@ default-package-overrides:
  - storable-tuple ==0.0.3.3
  - storablevector ==0.2.13
  - store ==0.4.3.2
-  - store-core ==0.4.1
+  - store-core ==0.4.3
  - Strafunski-StrategyLib ==5.0.1.0
  - stratosphere ==0.19.1
  - streaming ==0.2.1.0
@ -2027,9 +2116,9 @@ default-package-overrides:
  - textlocal ==0.1.0.5
  - text-manipulate ==0.2.0.1
  - text-metrics ==0.3.0
-  - text-postgresql ==0.0.2.3
+  - text-postgresql ==0.0.3.0
  - text-printer ==0.5
-  - text-region ==0.3.0.0
+  - text-region ==0.3.1.0
  - text-short ==0.1.2
  - text-show ==3.7.2
  - text-show-instances ==3.6.3
@ -2143,8 +2232,8 @@ default-package-overrides:
  - union-find ==0.2
  - uniplate ==1.6.12
  - uniq-deep ==1.1.0.0
-  - unique ==0
  - Unique ==0.4.7.2
+  - unique ==0
  - unit-constraint ==0.0.0
  - units-parser ==0.1.1.2
  - universe ==1.0
@ -2163,7 +2252,7 @@ default-package-overrides:
  - unordered-containers ==0.2.9.0
  - unordered-intmap ==0.1.0.0
  - unsafe ==0.0
-  - uri-bytestring ==0.3.1.1
+  - uri-bytestring ==0.3.2.0
  - uri-bytestring-aeson ==0.1.0.6
  - uri-encode ==1.5.0.5
  - uri-templater ==0.3.1.0
@ -2192,7 +2281,7 @@ default-package-overrides:
  - validity-uuid ==0.0.0.0
  - validity-vector ==0.1.0.0
  - varying ==0.7.0.3
-  - vault ==0.3.1.0
+  - vault ==0.3.1.1
  - vcswrapper ==0.1.6
  - vector ==0.12.0.1
  - vector-algorithms ==0.7.0.1
@ -2259,7 +2348,7 @@ default-package-overrides:
  - web-routes-th ==0.22.6.3
  - web-routes-wai ==0.24.3.1
  - webrtc-vad ==0.1.0.3
-  - websockets ==0.12.4.1
+  - websockets ==0.12.5.0
  - websockets-rpc ==0.6.0
  - websockets-simple ==0.0.6.3
  - websockets-snap ==0.10.3.0
@ -2382,7 +2471,7 @@ default-package-overrides:
  - zeromq4-haskell ==0.7.0
  - zim-parser ==0.2.1.0
  - zip ==1.0.0
-  - zip-archive ==0.3.2.4
+  - zip-archive ==0.3.2.5
  - zippers ==0.2.5
  - zlib ==0.6.2
  - zlib-bindings ==0.1.1.5
@ -2895,6 +2984,7 @@ dont-distribute-packages:
  Animas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  animascii:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  animate-example:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  animate-frames:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  animate-preview:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  animate-sdl2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  animate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2911,6 +3001,7 @@ dont-distribute-packages:
  antlrc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  anydbm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  aosd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  apart:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  apelsin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  api-builder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  api-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3100,6 +3191,7 @@ dont-distribute-packages:
  base64-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  basic-sop:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  BASIC:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  basic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  baskell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  batchd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  battlenet-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3123,6 +3215,7 @@ dont-distribute-packages:
  Befunge93:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  bein:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  belka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bench-graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  BenchmarkHistory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  bencoding:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  berkeleydb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3240,6 +3333,7 @@ dont-distribute-packages:
  BlastHTTP:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  blatex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  blaze-builder-enumerator:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blaze-colonnade:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  blaze-html-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  blaze-html-hexpat:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  blaze-html-truncate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3267,6 +3361,7 @@ dont-distribute-packages:
  board-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  bogre-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  bolt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boltzmann-brain:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  bond-haskell-compiler:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  bond-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3346,6 +3441,7 @@ dont-distribute-packages:
  cabal-ghc-dynflags:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  cabal-ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  cabal-graphdeps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-helper:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  Cabal-ide-backend:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  cabal-info:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  cabal-install-bundle:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3519,6 +3615,9 @@ dont-distribute-packages:
  citeproc-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  cj-token:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  cjk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cl3-hmatrix-interface:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cl3-linear-interface:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cl3:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  clac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  clafer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  claferIG:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3720,6 +3819,7 @@ dont-distribute-packages:
  content-store:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  context-stack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  ContextAlgebra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  contiguous:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  continue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  continuum-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  continuum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4081,6 +4181,7 @@ dont-distribute-packages:
  dist-upload:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  Dist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  DisTract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-fork-aws-lambda:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  distributed-process-async:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  distributed-process-azure:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  distributed-process-client-server:            [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4210,6 +4311,7 @@ dont-distribute-packages:
  edentv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  edge:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  edit-lenses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  edit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  editable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  editline:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  EditTimeReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4256,6 +4358,7 @@ dont-distribute-packages:
  engine-io-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  engine-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  entangle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  EntrezHTTP:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  EnumContainers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  enumerate-function:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  enumeration:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4288,6 +4391,7 @@ dont-distribute-packages:
  escape-artist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  esotericbot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  EsounD:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  espial:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  esqueleto:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  ess:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  estimators:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4341,6 +4445,7 @@ dont-distribute-packages:
  exists:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  exitcode:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  exp-extended:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exp-pairs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  expand:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  expat-enumerator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  expiring-containers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4569,6 +4674,7 @@ dont-distribute-packages:
  freesound:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  freetype-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  FreeTypeGL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freq:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  fresco-binding:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  fresh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  friday-devil:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5192,6 +5298,8 @@ dont-distribute-packages:
  haphviz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  happindicator3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  happindicator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happlets-lib-gtk:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happlets:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  happraise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  HAppS-Data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  happs-hsp-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5580,6 +5688,7 @@ dont-distribute-packages:
  hi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  hiccup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  hichi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hid-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  hieraclus:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  hierarchical-clustering-diagrams:             [ i686-linux, x86_64-linux, x86_64-darwin ]
  hierarchical-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5991,6 +6100,7 @@ dont-distribute-packages:
  hunit-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  hunit-rematch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  hunp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hunspell-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  hunt-searchengine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  hunt-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  hurdle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6000,10 +6110,16 @@ dont-distribute-packages:
  huttons-razor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  huzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  hVOIDP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-balancedparens:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-dsv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-excess:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  hw-json-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  hw-json:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  hw-kafka-avro:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  hw-prim-bits:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-rankselect-base:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-rankselect:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-succinct:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  hw-xml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  hwall-auth-iitk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  hweblib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6049,6 +6165,7 @@ dont-distribute-packages:
  hyperloglog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  hyperloglogplus:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  hyperpublic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hyphenate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  hypher:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  hzulip:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  i18n:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6799,6 +6916,7 @@ dont-distribute-packages:
  memorable-bits:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  mercury-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  merge-bash-history:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mergeless:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  merkle-patricia-db:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  messente:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  meta-misc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6977,7 +7095,6 @@ dont-distribute-packages:
  mulang:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  multext-east-msd:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  multi-cabal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multi-ghc-travis:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  multiaddr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  multifile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  multifocal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7412,6 +7529,7 @@ dont-distribute-packages:
  perceptron:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  perdure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  peregrin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  perf-analysis:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  perf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  perfecthash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7534,6 +7652,7 @@ dont-distribute-packages:
  PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  plugins-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  plugins-multistage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plur:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  png-file:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  pngload-fixed:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  pngload:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7631,6 +7750,7 @@ dont-distribute-packages:
  prettyprinter-vty:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  primesieve:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  primitive-simd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  primitive-sort:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  PrimitiveArray-Pretty:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  PrimitiveArray:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  primula-board:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7973,6 +8093,7 @@ dont-distribute-packages:
  req-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  reqcatcher:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  request-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  require:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  rerebase:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  reroute:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  reserve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8149,6 +8270,7 @@ dont-distribute-packages:
  scholdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  science-constants-dimensional:                [ i686-linux, x86_64-linux, x86_64-darwin ]
  science-constants:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SciFlow:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  scion-browser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  scion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  scons2dot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8254,6 +8376,7 @@ dont-distribute-packages:
  servant-scotty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  servant-smsc-ru:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  servant-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-streaming-client:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  servant-xml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  servant-zeppelin-client:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  servant-zeppelin-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8639,6 +8762,7 @@ dont-distribute-packages:
  Stomp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  storable-static-array:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  storablevector-streamfusion:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  store-streaming:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  str:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  Strafunski-ATermLib:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  Strafunski-Sdf2Haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8686,6 +8810,7 @@ dont-distribute-packages:
  suffixarray:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  SuffixStructures:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  suitable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  summoner:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  sunlight:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  sunroof-compiler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  sunroof-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8790,6 +8915,7 @@ dont-distribute-packages:
  tamarin-prover-utils:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  tamarin-prover:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  Tape:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tar-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  target:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  tart:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  task-distribution:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8803,6 +8929,7 @@ dont-distribute-packages:
  tasty-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  tasty-tap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  tasty-travis:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Taxonomy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  TaxonomyTools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  TBC:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  TBit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8942,6 +9069,7 @@ dont-distribute-packages:
  time-machine:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  time-parsers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  time-patterns:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-quote:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  time-recurrence:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  time-series-lib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  time-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8957,6 +9085,7 @@ dont-distribute-packages:
  timers-tick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  timeseries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  timezone-unix:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tintin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  TinyLaunchbury:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  tinyMesh:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  TinyURL:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -9170,6 +9299,10 @@ dont-distribute-packages:
  unordered-containers-rematch:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  unordered-graphs:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  unpack-funcs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unpacked-either:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unpacked-maybe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unpacked-these:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unpacked-validation:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  unroll-ghc-plugin:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  unsafely:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  unscramble:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -9194,6 +9327,7 @@ dont-distribute-packages:
  urldecode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  urldisp-happstack:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  UrlDisp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  urlencoded:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  URLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  urn-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  urn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -9538,6 +9672,8 @@ dont-distribute-packages:
  yam-servant:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  yam-transaction-odbc:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  yam-transaction-postgresql:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yam-web:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaml-pretty-extras:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  yaml-rpc-scotty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  yaml-rpc-snap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  yaml-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -9639,8 +9775,10 @@ dont-distribute-packages:
  yoko:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  york-lava:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  yql:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yu-auth:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  yu-core:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  yu-launch:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yu-tool:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  yuiGrid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  yuuko:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  yxdb-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -9651,6 +9789,7 @@ dont-distribute-packages:
  ZEBEDDE:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  zendesk-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  zeno:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zephyr:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  zeromq-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  zeromq3-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  zeromq3-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@ -144,7 +144,16 @@ self: super: builtins.intersectAttrs super {
  gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
  gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2;
  gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3;
-  taffybar = (addPkgconfigDepend super.taffybar pkgs.gtk3).override { dbus = self.dbus_1_0_1; };
+
+  # Add necessary reference to gtk3 package, plus specify needed dbus version, plus turn on strictDeps to fix build
+  taffybar = ((addPkgconfigDepend super.taffybar pkgs.gtk3).overrideDerivation (drv: { strictDeps = true; })).override { dbus = self.dbus_1_0_1; };
+
+  # Specify needed dbus version
+  dbus-hslogger = super.dbus-hslogger.override { dbus = self.dbus_1_0_1; };
+  status-notifier-item = super.status-notifier-item.override { dbus = self.dbus_1_0_1; };
+
+  # Add necessary reference to gtk3 package
+  gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3;

  # Need WebkitGTK, not just webkit.
  webkit = super.webkit.override { webkit = pkgs.webkitgtk24x-gtk2; };
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@ -102,8 +102,7 @@ let
  callPackage = drv: args: callPackageWithScope defaultScope drv args;

  withPackages = packages: buildPackages.callPackage ./with-packages-wrapper.nix {
-    inherit (self) llvmPackages;
-    inherit ghc;
+    inherit (self) ghc llvmPackages;
    inherit packages;
  };

@ -120,7 +119,7 @@ let
      installPhase = ''
        export HOME="$TMP"
        mkdir -p "$out"
-        cabal2nix --compiler=${ghc.haskellCompilerName} --system=${hostPlatform.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix"
+        cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix"
      '';
  };

--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@ -2,7 +2,7 @@

 buildGoPackage rec {
  name = "joker-${version}";
-  version = "0.9.2";
+  version = "0.9.3";

  goPackagePath = "github.com/candid82/joker";

@ -10,7 +10,7 @@ buildGoPackage rec {
    rev = "v${version}";
    owner = "candid82";
    repo = "joker";
-    sha256 = "1ayp7arygd3l4a1zbkhvix84fpqnnncbdxhimymr3c75ymwmmdr8";
+    sha256 = "1738gr25hlffc8ppzy6kik21jfix9iy316kv1kj1lqxr8giirhf6";
  };

  preBuild = "go generate ./...";
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@ -1,10 +1,11 @@
 { stdenv, fetchurl, makeFontsConf, makeWrapper
 , cairo, coreutils, fontconfig, freefont_ttf
-, glib, gmp, gtk2, libedit, libffi, libjpeg
+, glib, gmp, gtk3, libedit, libffi, libjpeg
 , libpng, libtool, mpfr, openssl, pango, poppler
 , readline, sqlite
 , disableDocs ? false
 , CoreFoundation
+, gsettings_desktop_schemas
 }:

 let
@ -18,7 +19,8 @@ let
    fontconfig
    glib
    gmp
-    gtk2
+    gtk3
+    gsettings_desktop_schemas
    libedit
    libjpeg
    libpng
@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
    (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
  ];

-  buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ]
+  buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings_desktop_schemas gtk3 ]
    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ];

  preConfigure = ''
@ -76,7 +78,9 @@ stdenv.mkDerivation rec {

  postInstall = ''
    for p in $(ls $out/bin/) ; do
-      wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${LD_LIBRARY_PATH}";
+      wrapProgram $out/bin/$p \
+        --prefix LD_LIBRARY_PATH ":" "${LD_LIBRARY_PATH}" \
+        --prefix XDG_DATA_DIRS ":" "$GSETTINGS_SCHEMAS_PATH";
    done
  '';

--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@ -55,7 +55,8 @@ stdenv.mkDerivation rec {
  configureFlags = [
    "--disable-oss"
  ] ++ optional (!x11Support) "--without-x"
-    ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib";
+    ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"
+    ++ optional stdenv.isDarwin "--disable-sdltest";

  postInstall = ''
    moveToOutput lib/libSDL2main.a "$dev"
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
  buildInputs = [ SDL2 ]
    ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;

-  configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx";
+  configureFlags = [(if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx")]
+     ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";

  meta = with stdenv.lib; {
    description = "SDL graphics drawing primitives and support functions";
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
  buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ]
    ++ stdenv.lib.optional stdenv.isDarwin Foundation;

+
+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+
  enableParallelBuilding = true;

  meta = with stdenv.lib; {
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
  propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ];

  configureFlags = [ "--disable-music-ogg-shared" ]
-    ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl";
+    ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"
+    ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ];

  meta = with stdenv.lib; {
    description = "SDL multi-channel audio mixer library";
--- a/pkgs/development/libraries/SDL2_net/default.nix
+++ b/pkgs/development/libraries/SDL2_net/default.nix
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {

  buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;

+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+
  propagatedBuildInputs = [ SDL2 ];

  meta = with stdenv.lib; {
--- a/pkgs/development/libraries/SDL2_ttf/default.nix
+++ b/pkgs/development/libraries/SDL2_ttf/default.nix
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
    sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl";
  };

+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+
  buildInputs = [ SDL2 freetype libGL ]
    ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;

--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
    "-Djasper=true"
    "-Dx11=true"
    "-Dgir=${if gobjectIntrospection != null then "true" else "false"}"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "-Dbuiltin_loaders=all";
+  ];

  postPatch = ''
    chmod +x build-aux/* # patchShebangs only applies to executables
@ -73,8 +73,16 @@ stdenv.mkDerivation rec {
  '';

  postInstall =
-    # All except one utility seem to be only useful during building.
+    # meson erroneously installs loaders with .dylib extension on Darwin.
+    # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them.
+    stdenv.lib.optionalString stdenv.isDarwin ''
+      for f in $out/${passthru.moduleDir}/*.dylib; do
+          install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
+          mv $f ''${f%.dylib}.so
+      done
    ''
+    # All except one utility seem to be only useful during building.
+    + ''
      moveToOutput "bin" "$dev"
      moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"

@ -82,12 +90,8 @@ stdenv.mkDerivation rec {
      $dev/bin/gdk-pixbuf-query-loaders --update-cache
    '';

-  # The fixDarwinDylibNames hook doesn't patch library references or binaries.
+  # The fixDarwinDylibNames hook doesn't patch binaries.
  preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
-    for f in $(find $out/lib -name '*.dylib'); do
-        install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
-    done
-
    for f in $out/bin/* $dev/bin/*; do
        install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
    done
--- a/pkgs/development/libraries/getdns/default.nix
+++ b/pkgs/development/libraries/getdns/default.nix
@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
  pname = "getdns";
  name = "${pname}-${version}";
-  version = "1.4.1";
+  version = "1.4.2";

  src = fetchurl {
-    url = "https://getdnsapi.net/releases/${pname}-1-4-1/${pname}-${version}.tar.gz";
-    sha256 = "07n5n5m4dnnh2xkh7wrnlx8s8myrvjf2nbs7n5m5nq8gg3f36li4";
+    url = "https://getdnsapi.net/releases/${pname}-1-4-2/${pname}-${version}.tar.gz";
+    sha256 = "100fzjpvajvnv0kym8g5lkwyv8w8vhy7g2p0pb2gyz19zqnvi18n";
  };

  nativeBuildInputs = [ libtool m4 autoreconfHook automake file ];
--- a/pkgs/development/libraries/libbdplus/default.nix
+++ b/pkgs/development/libraries/libbdplus/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }:
+{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex, gettext }:

 # library that allows libbluray to play BDplus protected bluray disks
 # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
    sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
  };

-  buildInputs = [ libgcrypt libgpgerror ];
+  buildInputs = [ libgcrypt libgpgerror gettext ];

  nativeBuildInputs = [ ];

--- a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
+++ b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
@ -1,21 +1,26 @@
-diff -ru3 libbluray-0.8.0/configure.ac libbluray-0.8.0-new/configure.ac
--- libbluray-0.8.0/configure.ac	2015-04-10 09:48:23.000000000 +0300
-+++ libbluray-0.8.0-new/configure.ac	2015-05-18 14:22:01.002075482 +0300
-@@ -231,6 +231,7 @@
-   AC_DEFINE([USING_BDJAVA], [1], ["Define to 1 if using BD-Java"])
-   AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
-   AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
-+  CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
+diff --git a/configure.ac b/configure.ac
+index 5fd3c8de..7ae343e0 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -228,6 +228,10 @@ if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then
+     AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.])
 fi
- AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
 
-diff -ru3 libbluray-0.8.0/src/libbluray/bdj/bdj.c libbluray-0.8.0-new/src/libbluray/bdj/bdj.c
--- libbluray-0.8.0/src/libbluray/bdj/bdj.c	2015-04-06 19:25:09.000000000 +0300
-+++ libbluray-0.8.0-new/src/libbluray/bdj/bdj.c	2015-05-18 14:22:59.241312808 +0300
-@@ -228,6 +228,7 @@
- #ifdef _WIN32
-         "" BDJ_JARFILE,
- #else
+if test "x$use_bdjava_jar" = "xyes"; then
+  CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
+fi
+
+ AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
+ AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
+ AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ])
+diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
+index 511ad533..e273b9e0 100644
+--- a/src/libbluray/bdj/bdj.c
+++ b/src/libbluray/bdj/bdj.c
+@@ -478,6 +478,7 @@ static const char *_find_libbluray_jar(BDJ_STORAGE *storage)
+     // pre-defined search paths for libbluray.jar
+     static const char * const jar_paths[] = {
+ #ifndef _WIN32
 +        JARDIR "/" BDJ_JARFILE,
         "/usr/share/java/" BDJ_JARFILE,
         "/usr/share/libbluray/lib/" BDJ_JARFILE,
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@ -0,0 +1,45 @@
+{ stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
+, GConf, gdk_pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor
+, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver
+, libXtst, nspr, nss, pango, libpulseaudio, systemd }:
+
+let
+  libPath =
+    stdenv.lib.makeLibraryPath [
+      alsaLib atk cairo cups dbus expat fontconfig GConf gdk_pixbuf glib gtk2
+      libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi
+      libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio
+      systemd
+    ];
+in
+stdenv.mkDerivation rec {
+  name = "cef-binary-${version}";
+  # Not very recent but more recent versions have problems:
+  # https://github.com/bazukas/obs-linuxbrowser/issues/63
+  version = "3.3325.1750.gaabe4c4";
+  src = fetchurl {
+    url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2";
+    sha256 = "06pj1ci1lwammz1vwmbgw2fri7gkvbpv4iw67pqckd9xz0cfhwzr";
+  };
+  nativeBuildInputs = [ cmake ];
+  makeFlags = "libcef_dll_wrapper";
+  dontStrip = true;
+  dontPatchELF = true;
+  installPhase = ''
+    mkdir -p $out/lib/ $out/share/cef/
+    cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/
+    cp ../Release/libcef.so $out/lib/
+    patchelf --set-rpath "${libPath}" $out/lib/libcef.so
+    cp ../Release/*.bin $out/share/cef/
+    cp -r ../Resources/* $out/share/cef/
+    cp -r ../include $out/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple framework for embedding Chromium-based browsers in other applications";
+    homepage = http://opensource.spotify.com/cefbuilds/index.html;
+    maintainers = with maintainers; [ puffnfresh ];
+    license = licenses.bsd3;
+    platforms = with platforms; linux;
+  };
+}
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@ -2,7 +2,7 @@
 , gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }:

 let
-  version = "3.28.1";
+  version = "3.28.2";
  pname = "libdazzle";
 in
 stdenv.mkDerivation {
@ -13,7 +13,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "04j9pjigpgxddq6y90y73k8qyjixlalip87q121ss5d8zp8xnz32";
+    sha256 = "1kfxnyqjwb1r8d4bpr59j1cikd94m6nxf1641hlg7dqlpl9rwlan";
  };

  nativeBuildInputs = [ ninja meson pkgconfig vala gobjectIntrospection libxml2 gtk-doc docbook_xsl dbus xvfb_run ];
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "librealsense-${version}";
-  version = "2.11.1";
+  version = "2.12.0";

  src = fetchFromGitHub {
    owner = "IntelRealSense";
    repo = "librealsense";
    rev = "v${version}";
-    sha256 = "1r27pdisg4hl4x23lrmykqfdc5agrc4pi161mhvzd1vjfkjrxbid";
+    sha256 = "1hmrp39x6c8i1l5d0hla0c8k6mf70sdyfjrlnwiqyi2p4s6phyd2";
  };

  buildInputs = [
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    "--with-libiconv-prefix=${libiconv}"
  ];

-  doCheck = !stdenv.hostPlatform.isMusl;
+  doCheck = true;

  enableParallelBuilding = true;

--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, perl }:

 stdenv.mkDerivation rec {
-  name = "mbedtls-2.9.0";
+  name = "mbedtls-2.10.0";

  src = fetchFromGitHub {
    owner = "ARMmbed";
    repo = "mbedtls";
    rev = name;
-    sha256 = "1pb1my8wwa757hvd06qwidkj58fa1wayf16g98q600xhya5fj3vx";
+    sha256 = "0im83kqf7a64ywxh6dnv0by3gwxww93zx5wpdqglr6xp7b8yg4xk";
  };

  nativeBuildInputs = [ perl ];
--- a/pkgs/development/libraries/ndpi/default.nix
+++ b/pkgs/development/libraries/ndpi/default.nix
@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap }:

-let version = "1.8"; in
+let version = "2.2"; in

 stdenv.mkDerivation rec {
  name = "ndpi-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    owner = "ntop";
    repo = "nDPI";
    rev = "${version}";
-    sha256 = "0kxp9dv4d1nmr2cxv6zsfy2j14wyb0q6am0qyxg0npjb08p7njf4";
+    sha256 = "06gg8lhn944arlczmv5i40jkjdnl1nrvsmvm843l9ybcswpayv4m";
  };

  configureScript = "./autogen.sh";
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/default.nix
@ -1,4 +1,4 @@
-{ callPackage, cudatoolkit7, cudatoolkit75, cudatoolkit8, cudatoolkit9 }:
+{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9 }:

 let
  generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@ -8,37 +8,44 @@ let
 in

 {
-  cudnn_cudatoolkit7 = generic rec {
+  cudnn_cudatoolkit_7 = generic rec {
    version = "4.0";
-    cudatoolkit = cudatoolkit7;
+    cudatoolkit = cudatoolkit_7;
    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}-prod.tgz";
    sha256 = "0zgr6qdbc29qw6sikhrh6diwwz7150rqc8a49f2qf37j2rvyyr2f";
  };

-  cudnn_cudatoolkit75 = generic rec {
+  cudnn_cudatoolkit_7_5 = generic rec {
    version = "6.0";
-    cudatoolkit = cudatoolkit75;
+    cudatoolkit = cudatoolkit_7_5;
    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz";
    sha256 = "0b68hv8pqcvh7z8xlgm4cxr9rfbjs0yvg1xj2n5ap4az1h3lp3an";
  };

-  cudnn6_cudatoolkit8 = generic rec {
+  cudnn6_cudatoolkit_8 = generic rec {
    version = "6.0";
-    cudatoolkit = cudatoolkit8;
+    cudatoolkit = cudatoolkit_8;
    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz";
    sha256 = "173zpgrk55ri8if7s5yngsc89ajd6hz4pss4cdxlv6lcyh5122cv";
  };

-  cudnn_cudatoolkit8 = generic rec {
+  cudnn_cudatoolkit_8 = generic rec {
    version = "7.0.5";
-    cudatoolkit = cudatoolkit8;
+    cudatoolkit = cudatoolkit_8;
    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
    sha256 = "9e0b31735918fe33a79c4b3e612143d33f48f61c095a3b993023cdab46f6d66e";
  };

-  cudnn_cudatoolkit9 = generic rec {
+  cudnn_cudatoolkit_9_0 = generic rec {
    version = "7.0.5";
-    cudatoolkit = cudatoolkit9;
+    cudatoolkit = cudatoolkit_9_0;
+    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
+    sha256 = "03mbv4m5lhwnc181xz8li067pjzzhxqbxgnrfc68dffm8xj0fghs";
+  };
+
+  cudnn_cudatoolkit_9 = generic rec {
+    version = "7.0.5";
+    cudatoolkit = cudatoolkit_9;
    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
    sha256 = "1rfmdd2v47p83fm3sfyvik31gci0q17qs6kjng6mvcsd6akmvb8y";
  };
--- a/pkgs/development/libraries/science/math/nccl/default.nix
+++ b/pkgs/development/libraries/science/math/nccl/default.nix
@ -1,4 +1,4 @@
-{ callPackage, cudatoolkit8, cudatoolkit9 }:
+{ callPackage, cudatoolkit_8, cudatoolkit_9 }:

 let
  generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@ -8,16 +8,16 @@ let
 in

 {
-  nccl_cudatoolkit8 = generic rec {
+  nccl_cudatoolkit_8 = generic rec {
    version = "2.1.4";
-    cudatoolkit = cudatoolkit8;
+    cudatoolkit = cudatoolkit_8;
    srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz";
    sha256 = "1lwwm8kdhna5m318yg304kl2gsz1jwhv4zv4gn8av2m57zh848zi";
  };

-  nccl_cudatoolkit9 = generic rec {
+  nccl_cudatoolkit_9 = generic rec {
    version = "2.1.4";
-    cudatoolkit = cudatoolkit9;
+    cudatoolkit = cudatoolkit_9;
    srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz";
    sha256 = "0pajmqzkacpszs63jh2hw2qqc49kj75kcf7r0ky8hdh560q8xn0p";
  };
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "wolfssl-${version}";
-  version = "3.13.0";
+  version = "3.15.0";

  src = fetchFromGitHub {
    owner = "wolfSSL";
    repo = "wolfssl";
    rev = "v${version}-stable";
-    sha256 = "0mvq7ifcpckfrg0zzcxqfbrv08pnz4a8g2z2j3s9h3cwns9ipn6h";
+    sha256 = "1jqhq0dl2zxks7dm6g3dm1zvrl646ab073kgg8ypv19nkd5cvbdv";
  };

  outputs = [ "out" "dev" "doc" "lib" ];
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
      jdk python3 which
    ]) + ":${platformTools}/platform-tools";
  in ''
-    set -x
    mkdir -pv $out/libexec
    mkdir -pv $out/lib64
    ln -s ${ncurses5.out}/lib/libncursesw.so.5 $out/lib64/libtinfo.so.5
--- a/pkgs/development/ocaml-modules/functory/default.nix
+++ b/pkgs/development/ocaml-modules/functory/default.nix
@ -1,14 +1,24 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{ stdenv, fetchurl, ocaml, findlib }:

 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";

+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
+    version = "0.6";
+    sha256 = "18wpyxblz9jh5bfp0hpffnd0q8cq1b0dqp0f36vhqydfknlnpx8y";
+  } else {
+    version = "0.5";
+    sha256 = "1j17rhifdjv1z262dma148ywg34x0zjn8vczdrnkwajsm4qg1hw3";
+  };
+in
+
 stdenv.mkDerivation {

-  name = "ocaml-functory-0.5";
+  name = "ocaml${ocaml.version}-functory-${param.version}";

  src = fetchurl {
-    url = https://www.lri.fr/~filliatr/functory/download/functory-0.5.tar.gz;
-    sha256 = "1j17rhifdjv1z262dma148ywg34x0zjn8vczdrnkwajsm4qg1hw3";
+    url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz";
+    inherit (param) sha256;
  };

  buildInputs = [ ocaml findlib ];
--- a/pkgs/development/perl-modules/BerkeleyDB/default.nix
+++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix
@ -1,11 +1,11 @@
 {buildPerlPackage, fetchurl, db}:

 buildPerlPackage rec {
-  name = "BerkeleyDB-0.54";
-  
+  name = "BerkeleyDB-0.55";
+
  src = fetchurl {
    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-    sha256 = "010e66d0034b93a8397c600da320611149aef7861eaf1f93b95e49ae37b825b8";
+    sha256 = "0kz40wqr7qwag43qnmkpri03cjnqwzb0kj0vc9aw9yz2qx0y2a3g";
  };

  preConfigure = ''
--- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
+++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
@ -1,11 +1,11 @@
 { fetchurl, buildPerlPackage, zlib, stdenv }:

 buildPerlPackage rec {
-  name = "Compress-Raw-Zlib-2.074";
+  name = "Compress-Raw-Zlib-2.081";

  src = fetchurl {
    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-    sha256 = "08bpx9v6i40n54rdcj6invlj294z20amrl8wvwf9b83aldwdwsd3";
+    sha256 = "06rsm9ahp20xfyvd3jc69sd0k8vqysryxc6apzdbn96jbcsdwmp1";
  };

  preConfigure = ''
--- a/pkgs/development/perl-modules/DBD-mysql/default.nix
+++ b/pkgs/development/perl-modules/DBD-mysql/default.nix
@ -1,11 +1,11 @@
 { fetchurl, buildPerlPackage, DBI, mysql }:

 buildPerlPackage rec {
-  name = "DBD-mysql-4.041";
+  name = "DBD-mysql-4.046";

  src = fetchurl {
-    url = "mirror://cpan/authors/id/M/MI/MICHIELB/${name}.tar.gz";
-    sha256 = "0h4h6zwzj8fwh9ljb8svnsa0a3ch4p10hp59kpdibdb4qh8xwxs7";
+    url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz";
+    sha256 = "1xziv9w87cl3fbl1mqkdrx28mdqly3gs6gs1ynbmpl2rr4p6arb1";
  };

  buildInputs = [ mysql.connector-c ] ;
--- a/pkgs/development/perl-modules/DBD-sybase/default.nix
+++ b/pkgs/development/perl-modules/DBD-sybase/default.nix
@ -0,0 +1,17 @@
+{ fetchurl, buildPerlPackage, DBI, freetds }:
+
+buildPerlPackage rec {
+  name = "DBD-Sybase-1.16";
+
+  src = fetchurl {
+    url = "mirror://cpan/authors/id/M/ME/MEWP/${name}.tar.gz";
+    sha256 = "1k6n261nrrcll9wxn5xwi4ibpavqv1il96687k62mbpznzl2gx37";
+  };
+
+  SYBASE = freetds;
+
+  buildInputs = [ freetds ] ;
+  propagatedBuildInputs = [ DBI ];
+
+  doCheck = false;
+}
--- a/pkgs/development/perl-modules/DB_File/default.nix
+++ b/pkgs/development/perl-modules/DB_File/default.nix
@ -1,11 +1,11 @@
 {fetchurl, buildPerlPackage, db}:

 buildPerlPackage rec {
-  name = "DB_File-1.831";
+  name = "DB_File-1.841";

  src = fetchurl {
    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-    sha256 = "0hq2vvcsa3nkb5bpcl0nkfsxhk8wyrsp3p3ara18rscrfd783hjs";
+    sha256 = "11fks42kgscpia0mxx4lc9krm7q4gv6w7m5h3m2jr3dl7viv36hn";
  };

  preConfigure = ''
--- a/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch
+++ b/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch
@ -1,49 +0,0 @@
-This patch configures Getopt::Long to pass options
-so they will be available at the second GetOptions call.
-
-Also an option to specify the search path for libfontconfig
-is added.
-diff -Naur GD-2.45/Makefile.PL GD-2.45-patched/Makefile.PL
--- GD-2.45/Makefile.PL	2009-07-10 13:40:07.000000000 -0430
-+++ GD-2.45-patched/Makefile.PL	2010-11-26 22:48:52.372992578 -0430
-@@ -16,9 +16,9 @@
- my (@INC,@LIBPATH,@LIBS);
- my $AUTOCONFIG = 0;      # global set by try_to_autoconfigure() below
- 
-my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force);
-+my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$lib_fontconfig_path,$force);
- 
-use Getopt::Long;
-+use Getopt::Long qw(:config pass_through);
- GetOptions("ignore_missing_gd" => \$force);
- 
- unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) {
-@@ -49,6 +49,7 @@
- 			"lib_jpeg_path=s" => \$lib_jpeg_path,
- 			"lib_xpm_path=s"  => \$lib_xpm_path,
- 			"lib_zlib_path=s" => \$lib_zlib_path,
-+                        "lib_fontconfig_path=s" => \$lib_fontconfig_path,
- 		       );
- unless ($result) {
-   print STDERR <<END;
-@@ -64,6 +65,7 @@
-      -lib_jpeg_path path            path to libjpeg
-      -lib_xpm_path  path            path to libxpm
-      -lib_zlib_path path            path to libpng
-+     -lib_fontconfig_path path      path to libfontconfig
-      -ignore_missing_gd             Ignore missing or old libgd installations and try to compile anyway
- 
- If no options are passed on the command line.  The program will
-@@ -111,6 +113,12 @@
-     @INC     = ("-I$lib_zlib_path/include", @INC);
-     @LIBPATH = ("-L$lib_zlib_path/lib", @LIBPATH); 
- }
-+if( defined($lib_fontconfig_path) ) 
-+{
-+    print "Fontconfig library used from:     $lib_fontconfig_path\n";
-+    @INC     = ("-I$lib_fontconfig_path/include", @INC);
-+    @LIBPATH = ("-L$lib_fontconfig_path/lib", @LIBPATH); 
-+}
- #############################################################################################
- 
- if ($^O eq 'VMS'){
--- a/Show More
+++ b/Show More