Merge remote-tracking branch 'upstream/master' into staging

Conflicts: pkgs/development/libraries/libclc/default.nix pkgs/top-level/all-packages.nix
2018-02-13 16:42:48 +02:00 · 2018-02-13 16:42:48 +02:00 · 1a06373c0a
commit 1a06373c0a
parent eb862c48dd 68052b5619
208 changed files with 3533 additions and 3234 deletions
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@ -79,6 +79,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
    fullName = ''Beerware License'';
  };

+  bsd0 = spdx {
+    spdxId = "0BSD";
+    fullName = "BSD Zero Clause License";
+  };
+
  bsd2 = spdx {
    spdxId = "BSD-2-Clause";
    fullName = ''BSD 2-clause "Simplified" License'';
@ -482,6 +487,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
    fullName = "PostgreSQL License";
  };

+  postman = {
+    fullName = "Postman EULA";
+    url = https://www.getpostman.com/licenses/postman_base_app;
+    free = false;
+  };
+
  psfl = spdx {
    spdxId = "Python-2.0";
    fullName = "Python Software Foundation License version 2";
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -47,6 +47,7 @@
  andir = "Andreas Rammhold <andreas@rammhold.de>";
  andres = "Andres Loeh <ksnixos@andres-loeh.de>";
  andrestylianos = "Andre S. Ramos <andre.stylianos@gmail.com>";
+  andrew-d = "Andrew Dunham <andrew@du.nham.ca>";
  andrewrk = "Andrew Kelley <superjoe30@gmail.com>";
  andsild = "Anders Sildnes <andsild@gmail.com>";
  aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>";
@ -492,6 +493,7 @@
  nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>";
  nico202 = "Nicolò Balzarotti <anothersms@gmail.com>";
  NikolaMandic = "Ratko Mladic <nikola@mandic.email>";
+  nipav = "Niko Pavlinek <niko.pavlinek@gmail.com>";
  nixy = "Andrew R. M. <nixy@nixy.moe>";
  nmattia = "Nicolas Mattia <nicolas@nmattia.com>";
  nocoolnametom = "Tom Doggett <nocoolnametom@gmail.com>";
@ -552,7 +554,7 @@
  pradeepchhetri = "Pradeep Chhetri <pradeep.chhetri89@gmail.com>";
  prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>";
  primeos = "Michael Weiss <dev.primeos@gmail.com>";
-  profpatsch = "Profpatsch <mail@profpatsch.de>";
+  Profpatsch = "Profpatsch <mail@profpatsch.de>";
  proglodyte = "Proglodyte <proglodyte23@gmail.com>";
  pshendry = "Paul Hendry <paul@pshendry.com>";
  psibi = "Sibi <sibi@psibi.in>";
@ -715,6 +717,7 @@
  utdemir = "Utku Demir <me@utdemir.com>";
  #urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012
  uwap = "uwap <me@uwap.name>";
+  va1entin = "Valentin Heidelberger <github@valentinsblog.com>";
  vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>";
  valeriangalliat = "Valérian Galliat <val@codejam.info>";
  vandenoever = "Jos van den Oever <jos@vandenoever.info>";
@ -762,6 +765,7 @@
  y0no = "Yoann Ono <y0no@y0no.fr>";
  yarr = "Dmitry V. <savraz@gmail.com>";
  yegortimoshenko = "Yegor Timoshenko <yegortimoshenko@gmail.com>";
+  yesbox = "Jesper Geertsen Jonsson <jesper.geertsen.jonsson@gmail.com>";
  ylwghst = "Burim Augustin Berisa <ylwghst@onionmail.info>";
  yochai = "Yochai <yochai@titat.info>";
  yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>";
--- a/lib/options.nix
+++ b/lib/options.nix
@ -85,6 +85,7 @@ rec {
    concatMap (opt:
      let
        docOption = rec {
+          loc = opt.loc;
          name = showOption opt.loc;
          description = opt.description or (throw "Option `${name}' has no description.");
          declarations = filter (x: x != unknownModule) opt.declarations;
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@ -63,18 +63,17 @@ let
  stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip;

  # Custom "less" that pushes up all the things ending in ".enable*"
-  # and ".package"
-  optionListLess = a: b:
+  # and ".package*"
+  optionLess = a: b:
    let
-      splt = lib.splitString ".";
      ise = lib.hasPrefix "enable";
      isp = lib.hasPrefix "package";
      cmp = lib.splitByAndCompare ise lib.compare
                                 (lib.splitByAndCompare isp lib.compare lib.compare);
-    in lib.compareLists cmp (splt a) (splt b) < 0;
+    in lib.compareLists cmp a.loc b.loc < 0;

  # Customly sort option list for the man page.
-  optionsList = lib.sort (a: b: optionListLess a.name b.name) optionsListDesc;
+  optionsList = lib.sort optionLess optionsListDesc;

  # Convert the list of options into an XML file.
  optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList);
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@ -38,6 +38,10 @@ has the following highlights: </para>
      </itemizedlist>
    </para>
  </listitem>
+
+  <listitem>
+    <para>PHP now defaults to PHP 7.2</para>
+  </listitem>
 </itemizedlist>

 </section>
@ -207,6 +211,12 @@ following incompatible changes:</para>
      </listitem>
    </itemizedlist>
  </listitem>
+  <listitem>
+    <para>
+      The <literal>jid</literal> package has been removed, due to maintenance
+      overhead of a go package having non-versioned dependencies.
+    </para>
+  </listitem>
 </itemizedlist>

 </section>
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@ -29,7 +29,7 @@ rec {
        cp ${./test-driver/Logger.pm} $libDir/Logger.pm

        wrapProgram $out/bin/nixos-test-driver \
-          --prefix PATH : "${lib.makeBinPath [ qemu vde2 netpbm coreutils ]}" \
+          --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \
          --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"
      '';
  };
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@ -111,11 +111,11 @@ in {
      after    = [ "network.target" ];
      script = ''
        ${pkgs.prometheus-alertmanager.bin}/bin/alertmanager \
-        -config.file ${alertmanagerYml} \
-        -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
-        -log.level ${cfg.logLevel} \
-        ${optionalString (cfg.webExternalUrl != null) ''-web.external-url ${cfg.webExternalUrl} \''}
-        ${optionalString (cfg.logFormat != null) "-log.format ${cfg.logFormat}"}
+        --config.file ${alertmanagerYml} \
+        --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+        --log.level ${cfg.logLevel} \
+        ${optionalString (cfg.webExternalUrl != null) ''--web.external-url ${cfg.webExternalUrl} \''}
+        ${optionalString (cfg.logFormat != null) "--log.format ${cfg.logFormat}"}
      '';

      serviceConfig = {
--- a/nixos/modules/services/networking/bird.nix
+++ b/nixos/modules/services/networking/bird.nix
@ -7,21 +7,27 @@ let
    let
      cfg = config.services.${variant};
      pkg = pkgs.${variant};
+      birdBin = if variant == "bird6" then "bird6" else "bird";
      birdc = if variant == "bird6" then "birdc6" else "birdc";
+      descr =
+        { bird = "1.9.x with IPv4 suport";
+          bird6 = "1.9.x with IPv6 suport";
+          bird2 = "2.x";
+        }.${variant};
      configFile = pkgs.stdenv.mkDerivation {
        name = "${variant}.conf";
        text = cfg.config;
        preferLocalBuild = true;
        buildCommand = ''
          echo -n "$text" > $out
-          ${pkg}/bin/${variant} -d -p -c $out
+          ${pkg}/bin/${birdBin} -d -p -c $out
        '';
      };
    in {
      ###### interface
      options = {
        services.${variant} = {
-          enable = mkEnableOption "BIRD Internet Routing Daemon";
+          enable = mkEnableOption "BIRD Internet Routing Daemon (${descr})";
          config = mkOption {
            type = types.lines;
            description = ''
@ -36,12 +42,12 @@ let
      config = mkIf cfg.enable {
        environment.systemPackages = [ pkg ];
        systemd.services.${variant} = {
-          description = "BIRD Internet Routing Daemon";
+          description = "BIRD Internet Routing Daemon (${descr})";
          wantedBy = [ "multi-user.target" ];
          serviceConfig = {
            Type = "forking";
            Restart = "on-failure";
-            ExecStart = "${pkg}/bin/${variant} -c ${configFile} -u ${variant} -g ${variant}";
+            ExecStart = "${pkg}/bin/${birdBin} -c ${configFile} -u ${variant} -g ${variant}";
            ExecReload = "${pkg}/bin/${birdc} configure";
            ExecStop = "${pkg}/bin/${birdc} down";
            CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID"
@ -56,14 +62,15 @@ let
        users = {
          extraUsers.${variant} = {
            description = "BIRD Internet Routing Daemon user";
-            group = "${variant}";
+            group = variant;
          };
          extraGroups.${variant} = {};
        };
      };
    };

-  inherit (config.services) bird bird6;
-in {
-  imports = [(generic "bird") (generic "bird6")];
+in
+
+{
+  imports = map generic [ "bird" "bird6" "bird2" ];
 }
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@ -46,6 +46,15 @@ in
        What addresses the server should listen on. (UDP+TCP 53)
      '';
    };
+    listenTLS = mkOption {
+      type = with types; listOf str;
+      default = [];
+      example = [ "198.51.100.1:853" "[2001:db8::1]:853" "853" ];
+      description = ''
+        Addresses on which kresd should provide DNS over TLS (see RFC 7858).
+        For detailed syntax see ListenStream in man systemd.socket.
+      '';
+    };
    # TODO: perhaps options for more common stuff like cache size or forwarding
  };

@ -75,6 +84,18 @@ in
      socketConfig.FreeBind = true;
    };

+    systemd.sockets.kresd-tls = mkIf (cfg.listenTLS != []) rec {
+      wantedBy = [ "sockets.target" ];
+      before = wantedBy;
+      partOf = [ "kresd.socket" ];
+      listenStreams = cfg.listenTLS;
+      socketConfig = {
+        FileDescriptorName = "tls";
+        FreeBind = true;
+        Service = "kresd.service";
+      };
+    };
+
    systemd.sockets.kresd-control = rec {
      wantedBy = [ "sockets.target" ];
      before = wantedBy;
@ -97,6 +118,8 @@ in
        Type = "notify";
        WorkingDirectory = cfg.cacheDir;
        Restart = "on-failure";
+        Sockets = [ "kresd.socket" "kresd-control.socket" ]
+          ++ optional (cfg.listenTLS != []) "kresd-tls.socket";
      };

      # Trust anchor goes from dns-root-data by default.
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@ -16,13 +16,13 @@ with stdenv.lib.strings;

 let

-  version = "2.5.10";
+  version = "2.5.21";

  src = fetchFromGitHub {
    owner = "grame-cncm";
    repo = "faust";
-    rev = "v${builtins.replaceStrings ["."] ["-"] version}";
-    sha256 = "0sjhy7axa2dj1977iz6zmqvz9qzalcfnrx2fqx3xmk9hly847d6z";
+    rev = "${version}";
+    sha256 = "1kfrcfhpzkpjxsrvgwmc2valgwfb4b7gfwwnlnjq6f6dp56yflpz";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/applications/misc/diffpdf/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, poppler_qt4, qmake4Hook }:
+{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler_qt5 }:

 stdenv.mkDerivation rec {
  version = "2.1.3";
@ -9,13 +9,19 @@ stdenv.mkDerivation rec {
    sha256 = "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566";
  };

-  patches = [ ./fix_path_poppler_qt4.patch ];
+  patches = [
+    (fetchpatch {
+      url = https://raw.githubusercontent.com/gentoo/gentoo/9b971631588ff46e7c2d501bc35cd0d9ce2d98e2/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch;
+      sha256 = "0sax8gcqcmzf74hmdr3rarqs4nsxmml9qmh6pqyjmgl3lypxhafg";
+    })
+    ./fix_path_poppler_qt5.patch
+  ];

-  buildInputs = [ qt4 poppler_qt4 ];
-  nativeBuildInputs = [ qmake4Hook ];
+  nativeBuildInputs = [ qmake qttools ];
+  buildInputs = [ qtbase poppler_qt5 ];

  preConfigure = ''
-    substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4.dev}
+    substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler_qt5.dev}
    lrelease diffpdf.pro
  '';

--- a/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch
+++ b/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch
@ -2,15 +2,15 @@ diff -uNr diffpdf-2.1.3/diffpdf.pro diffpdf-2.1.3-new/diffpdf.pro
 --- diffpdf-2.1.3/diffpdf.pro	2013-10-15 09:01:22.000000000 +0200
 +++ diffpdf-2.1.3-new/diffpdf.pro	2015-07-07 23:13:36.445572148 +0200
@@ -47,9 +47,9 @@
- 	INCLUDEPATH += /c/poppler_lib/include/poppler/qt4
+ 	INCLUDEPATH += /c/poppler_lib/include/poppler/qt5
 	LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin
     } else {
-	exists(/usr/include/poppler/qt4) {
+-	exists(/usr/include/poppler/qt5) {
 -	    INCLUDEPATH += /usr/include/poppler/cpp
-	    INCLUDEPATH += /usr/include/poppler/qt4
-+	exists(@@NIX_POPPLER_QT4@@/include/poppler/qt4) {
-+	    INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/cpp
-+	    INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/qt4
+-	    INCLUDEPATH += /usr/include/poppler/qt5
+	exists(@@NIX_POPPLER_QT5@@/include/poppler/qt5) {
+	    INCLUDEPATH += @@NIX_POPPLER_QT5@@/include/poppler/cpp
+	    INCLUDEPATH += @@NIX_POPPLER_QT5@@/include/poppler/qt5
 	} else {
 	    INCLUDEPATH += /usr/local/include/poppler/cpp
- 	    INCLUDEPATH += /usr/local/include/poppler/qt4
+ 	    INCLUDEPATH += /usr/local/include/poppler/qt5
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = http://lilyterm.luna.com.tw/;
    license = licenses.gpl3;
-    maintainers = with maintainers; [ AndersonTorres profpatsch ];
+    maintainers = with maintainers; [ AndersonTorres Profpatsch ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@ -1,8 +1,9 @@
-{ mkDerivation, stdenv, lib, fetchFromGitHub, procps ? null
+{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null
 , qtbase, qtwebengine, qtwebkit
 , cmake
 , syncthing, syncthing-inotify ? null
-, preferQWebView ? false }:
+, preferQWebView ? false
+, preferNative   ? true }:

 mkDerivation rec {
  version = "0.5.8";
@ -16,11 +17,18 @@ mkDerivation rec {
  };

  buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit;
+
  nativeBuildInputs = [ cmake ];

-  cmakeFlags = lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1";
+  cmakeFlags = [ ]
+    ++ lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1"
+    ++ lib.optional preferNative   "-DQST_BUILD_NATIVEBROWSER=1";

-  patches = [ ./qsyncthingtray-0.5.8-qt-5.6.3.patch ];
+  patches = [ (fetchpatch {
+    name = "support_native_browser.patch";
+    url = "https://patch-diff.githubusercontent.com/raw/sieren/QSyncthingTray/pull/225.patch";
+    sha256 = "0w665xdlsbjxs977pdpzaclxpswf7xys1q3rxriz181lhk2y66yy";
+  }) ] ++ lib.optional (!preferQWebView && !preferNative) ./qsyncthingtray-0.5.8-qt-5.6.3.patch;

  postPatch = ''
    ${lib.optionalString stdenv.isLinux ''
@ -60,6 +68,8 @@ mkDerivation rec {
    maintainers = with maintainers; [ zraexy peterhoeg ];
    platforms = platforms.all;
    # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8
-    broken = builtins.compareVersions qtbase.version "5.7.0" >= 0;
+    # but qt > 5.6 works when only using the native browser
+    # https://github.com/sieren/QSyncthingTray/issues/223
+    broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative);
  };
 }
--- a/pkgs/applications/misc/yokadi/default.nix
+++ b/pkgs/applications/misc/yokadi/default.nix
@ -0,0 +1,30 @@
+{ stdenv, fetchurl, buildPythonApplication, dateutil,
+  sqlalchemy, setproctitle, icalendar, pycrypto }:
+
+buildPythonApplication rec {
+  pname = "yokadi";
+  version = "1.1.1";
+
+  src = fetchurl {
+    url = "https://yokadi.github.io/download/${pname}-${version}.tar.bz2";
+    sha256 = "af201da66fd3a8435b2ccd932082ab9ff13f5f2e3d6cd3624f1ab81c577aaf17";
+  };
+
+  propagatedBuildInputs = [
+    dateutil
+    sqlalchemy
+    setproctitle
+    icalendar
+    pycrypto
+  ];
+
+  # Yokadi doesn't have any tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A command line oriented, sqlite powered, todo-list";
+    homepage = https://yokadi.github.io/index.html;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.nipav ];
+  };
+}
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@ -59,7 +59,7 @@
 , enableOfficialBranding ? true
 }:

-assert stdenv.cc ? libc && stdenv.cc.libc != null;
+assert stdenv.cc.libc or null != null;

 let
  flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
@ -100,29 +100,25 @@ stdenv.mkDerivation (rec {
    rm -f configure
    rm -f js/src/configure
    rm -f .mozconfig*
+  '' + (if lib.versionAtLeast version "58"
+  # this will run autoconf213
+  then ''
+    configureScript="$(realpath ./mach) configure"
+  '' else ''
+    make -f client.mk configure-files
+    configureScript="$(realpath ./configure)"
+  '') + ''
+    cxxLib=$( echo -n ${gcc}/include/c++/* )
+    archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine )

- '' + lib.optionalString (stdenv.lib.versionAtLeast version "58.0.0") ''
-    cat >.mozconfig <<END_MOZCONFIG
-    ${lib.concatStringsSep "\n" (map (flag: "ac_add_options ${flag}") configureFlags)}
-    ${lib.optionalString googleAPISupport "ac_add_options --with-google-api-keyfile=$TMPDIR/ga"}
-    END_MOZCONFIG
+    test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml
  '' + lib.optionalString googleAPISupport ''
    # Google API key used by Chromium and Firefox.
    # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
    # please get your own set of keys.
    echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga
    configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga")
-  '' + ''
-    # this will run autoconf213
-    ${if (stdenv.lib.versionAtLeast version "58.0.0") then "./mach configure" else "make -f client.mk configure-files"}
-
-    configureScript="$(realpath ./configure)"
-
-    cxxLib=$( echo -n ${gcc}/include/c++/* )
-    archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine )
-
-    test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml
-
+  '' + lib.optionalString (lib.versionOlder version "58") ''
    cd obj-*
  '';

@ -150,12 +146,12 @@ stdenv.mkDerivation (rec {
    "--disable-gconf"
    "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}"
  ]
-  ++ lib.optionals (stdenv.lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [
+  ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [
    # on i686-linux: --with-libclang-path is not available in this configuration
    "--with-libclang-path=${llvmPackages.libclang}/lib"
    "--with-clang-path=${llvmPackages.clang}/bin/clang"
  ]
-  ++ lib.optionals (stdenv.lib.versionAtLeast version "57") [
+  ++ lib.optionals (lib.versionAtLeast version "57") [
    "--enable-webrender=build"
  ]

@ -196,6 +192,16 @@ stdenv.mkDerivation (rec {
  ++ lib.optional enableOfficialBranding "--enable-official-branding"
  ++ extraConfigureFlags;

+  # Before 58 we have to run `make -f client.mk configure-files` at
+  # the top level, and then run `./configure` in the obj-* dir (see
+  # above), but in 58 we have to instead run `./mach configure` at the
+  # top level and then run `make` in obj-*. (We can also run the
+  # `make` at the top level in 58, but then we would have to `cd` to
+  # `make install` anyway. This is ugly, but simple.)
+  postConfigure = lib.optionalString (lib.versionAtLeast version "58") ''
+    cd obj-*
+  '';
+
  preBuild = lib.optionalString (enableOfficialBranding && isTorBrowserLike) ''
    buildFlagsArray=("MOZ_APP_DISPLAYNAME=Tor Browser")
  '';
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@ -99,26 +99,6 @@ rec {

 in rec {

-  tor-browser-6-5 = common (rec {
-    pname = "tor-browser";
-    version = "6.5.2";
-    isTorBrowserLike = true;
-    extraConfigureFlags = [ "--disable-loop" ];
-
-    # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
-    src = fetchFromGitHub {
-      owner = "SLNOS";
-      repo = "tor-browser";
-      # branch "tor-browser-45.8.0esr-6.5-2-slnos"
-      rev = "e4140ea01b9906934f0347e95f860cec207ea824";
-      sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60";
-    };
-  } // commonAttrs) {
-    stdenv = overrideCC stdenv gcc5;
-    ffmpegSupport = false;
-    gssSupport = false;
-  };
-
  tor-browser-7-0 = common (rec {
    pname = "tor-browser";
    version = "7.0.1";
@ -137,6 +117,24 @@ in rec {
      [ ./env_var_for_system_dir.patch ];
  } // commonAttrs) {};

-  tor-browser = tor-browser-7-0;
+  tor-browser-7-5 = common (rec {
+    pname = "tor-browser";
+    version = "7.5.2";
+    isTorBrowserLike = true;
+
+    # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
+    src = fetchFromGitHub {
+      owner = "SLNOS";
+      repo  = "tor-browser";
+      # branch "tor-browser-52.6.2esr-7.5-2-slnos";
+      rev   = "cf1a504aaa26af962ae909a3811c0038db2d2eec";
+      sha256 = "0llbk7skh1n7yj137gv7rnxfasxsnvfjp4ss7h1fbdnw19yba115";
+    };
+
+    patches =
+      [ ./env_var_for_system_dir.patch ];
+  } // commonAttrs) {};
+
+  tor-browser = tor-browser-7-5;

 })
--- a/pkgs/applications/networking/droopy/default.nix
+++ b/pkgs/applications/networking/droopy/default.nix
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
    description = "Mini Web server that let others upload files to your computer";
    homepage = http://stackp.online.fr/droopy;
    license = licenses.bsd3;
-    maintainers = [ maintainers.profpatsch ];
+    maintainers = [ maintainers.Profpatsch ];
  };

 }
--- a/pkgs/applications/networking/feedreaders/rss2email/default.nix
+++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix
@ -24,6 +24,6 @@ buildPythonApplication rec {
    description = "A tool that converts RSS/Atom newsfeeds to email.";
    homepage = https://pypi.python.org/pypi/rss2email;
    license = licenses.gpl2;
-    maintainers = with maintainers; [ jb55 profpatsch ];
+    maintainers = with maintainers; [ jb55 Profpatsch ];
  };
 }
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@ -1,29 +1,33 @@
 { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp
 , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev
-, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip
+, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp
 , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake
 , libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl
+, python, graphviz, belcard
 }:

 stdenv.mkDerivation rec {
  baseName = "linphone";
-  version = "3.10.2";
+  version = "3.12.0";
  name = "${baseName}-${version}";

  src = fetchFromGitHub {
    owner = "BelledonneCommunications";
    repo = "${baseName}";
    rev = "${version}";
-    sha256 = "053gad4amdbq5za8f2n9j5q59nkky0w098zbsa3dvpcqvv7ar16p";
+    sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j";
  };

  buildInputs = [
    readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11
    polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip
-    bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango
+    bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango bzrtp belcard
  ];

-  nativeBuildInputs = [ intltool pkgconfig makeWrapper cmake doxygen ];
+  nativeBuildInputs = [
+    intltool pkgconfig makeWrapper cmake doxygen graphviz
+    (python.withPackages (ps: [ ps.pystache ps.six ]))
+  ];

  NIX_CFLAGS_COMPILE = " -Wno-error -I${glib.dev}/include/glib-2.0
    -I${glib.out}/lib/glib-2.0/include -I${gtk2.dev}/include/gtk-2.0/
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name= "riot-web-${version}";
-  version = "0.13.3";
+  version = "0.13.5";

  src = fetchurl {
    url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "0acim3kad6lv5ni4blg75phb3njyk9s5h6x7fsn151h1pvsc5mmw";
+    sha256 = "1ap62ksi3dg7qijxxysjpnlmngzgh2jdldvb8s1jx14avanccch6";
  };

  installPhase = ''
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@ -31,7 +31,7 @@ in
 stdenv.mkDerivation rec {
  name = "teamspeak-client-${version}";

-  version = "3.1.7";
+  version = "3.1.8";

  src = fetchurl {
    urls = [
@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
      "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
    ];
    sha256 = if stdenv.is64bit
-                then "1ww20805b7iphkh1ra3py6f7l7s321cg70sfl9iw69n05l3313fn"
-                else "0yvhmbhliraakn9k4bij6rnai7hn50g4z6mfjsyliizf6437x4nr";
+                then "0yav71sfklqg2k3ayd0bllsixd486l0587s5ygjlc9gnchw3zg6z"
+                else "1agf6jf5hkyxazxqcnvcjfb263p5532ahi7h4rkifnnvqay36v5i";
  };

  # grab the plugin sdk for the desktop icon
@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
      free = false;
    };
    maintainers = [ stdenv.lib.maintainers.lhvwb ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
  };
 }

--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
    description = "Telegram client forked from sigram";
    homepage = http://aseman.co/en/products/cutegram/;
    license = licenses.gpl3;
-    maintainers = with maintainers; [ profpatsch AndersonTorres ];
+    maintainers = with maintainers; [ AndersonTorres ];
    platforms = platforms.linux;
  };
 }
-#TODO: appindicator, for system tray plugin (by @profpatsch)
+#TODO: appindicator, for system tray plugin
--- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
    description = "A fork of libqtelegram by Aseman, using qmake";
    homepage = src.meta.homepage;
    license = licenses.gpl3;
-    maintainers = [ maintainers.profpatsch ];
+    maintainers = [ maintainers.Profpatsch ];
    platforms = platforms.linux;
  };

--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
    description = "Telegram API tools for QtQml and Qml";
    homepage = src.meta.homepage;
    license = licenses.gpl3;
-    maintainers = [ maintainers.profpatsch ];
+    maintainers = [ maintainers.Profpatsch ];
    platforms = platforms.linux;
  };

--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch
@ -1,44 +0,0 @@
-From a736c0dfd22cd4ab0da86c30a664c91843df1b98 Mon Sep 17 00:00:00 2001
-From: Adam Ruzicka <a.ruzicka@outlook.com>
-Date: Sat, 29 Jul 2017 12:16:29 +0200
-Subject: [PATCH] notmuch-0.25 compatibility fix
-
---
- notmuch-addrlookup.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/notmuch-addrlookup.c b/notmuch-addrlookup.c
-index c5cf5b4..a95ded0 100644
--- a/notmuch-addrlookup.c
-+++ b/notmuch-addrlookup.c
-@@ -171,6 +171,13 @@ create_queries (notmuch_database_t *db,
-       count += tmp;
-   if (notmuch_query_count_messages_st (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
-       count += tmp;
-+#elif LIBNOTMUCH_MAJOR_VERSION >= 5
-+  unsigned int count = 0;
-+  unsigned int tmp;
-+  if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS)
-+      count += tmp;
-+  if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
-+      count += tmp;
- #else
-   unsigned int count = notmuch_query_count_messages (queries[0])
-                      + notmuch_query_count_messages (queries[1]);
-@@ -233,6 +240,13 @@ run_queries (notmuch_database_t *db,
- #if LIBNOTMUCH_MAJOR_VERSION >= 4 && LIBNOTMUCH_MINOR_VERSION >= 3
-       if (notmuch_query_search_messages_st (queries[i], &messages) != NOTMUCH_STATUS_SUCCESS)
-           continue;
-+#elif LIBNOTMUCH_MAJOR_VERSION >= 5
-+  unsigned int count = 0;
-+  unsigned int tmp;
-+  if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS)
-+      count += tmp;
-+  if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
-+      count += tmp;
- #else
-       if (!(messages = notmuch_query_search_messages (queries[i])))
-           continue;
--
-2.13.3
-
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
@ -1,32 +1,28 @@
 { stdenv, fetchFromGitHub, pkgconfig, glib, notmuch }:

+let
+  version = "9";
+in
 stdenv.mkDerivation rec {
  name = "notmuch-addrlookup-${version}";
-  version = "7";

  src = fetchFromGitHub {
    owner = "aperezdc";
    repo = "notmuch-addrlookup-c";
    rev ="v${version}";
-    sha256 = "0mz0llf1ggl1k46brgrqj3i8qlg1ycmkc5a3a0kg8fg4s1c1m6xk";
+    sha256 = "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc";
  };

  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [ glib notmuch ];

-  # Required until notmuch-addrlookup can be compiled against notmuch >= 0.25
-  patches = [ ./0001-notmuch-0.25-compatibility-fix.patch ];
-
-  installPhase = ''
-    mkdir -p "$out/bin"
-    cp notmuch-addrlookup "$out/bin"
-  '';
+  installPhase = "install -D notmuch-addrlookup $out/bin/notmuch-addrlookup";

  meta = with stdenv.lib; {
    description = "Address lookup tool for Notmuch in C";
    homepage = https://github.com/aperezdc/notmuch-addrlookup-c;
    maintainers = with maintainers; [ mog garbas ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    license = licenses.mit;
  };
 }
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@ -41,6 +41,6 @@ buildRustPackage rec {
    inherit (src.meta) homepage;
    description = "Decentralized Issue Tracking for git";
    license = licenses.gpl2;
-    maintainers = with maintainers; [ profpatsch matthiasbeyer ];
+    maintainers = with maintainers; [ Profpatsch matthiasbeyer ];
  };
 }
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@ -8,11 +8,11 @@

 stdenv.mkDerivation rec {
  name = "smartgithg-${version}";
-  version = "17_1_1";
+  version = "17_1_4";

  src = fetchurl {
-    url = "http://www.syntevo.com/static/smart/download/smartgit/smartgit-linux-${version}.tar.gz";
-    sha256 = "1zc1cs9gxv9498jp1nhi9z70dv9dzv0yh5f3bd89wi5zvcwly3d0";
+    url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz";
+    sha256 = "1x8s1mdxg7m3fy3izgnb1smrn4ng3q31x0sqnjlchkb5vx7gp5rh";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/applications/video/mpv/scripts/convert.nix
+++ b/pkgs/applications/video/mpv/scripts/convert.nix
@ -30,7 +30,7 @@ stdenv.mkDerivation {
  meta = {
    description = "Convert parts of a video while you are watching it in mpv";
    homepage = https://gist.github.com/Zehkul/25ea7ae77b30af959be0;
-    maintainers = [ lib.maintainers.profpatsch ];
+    maintainers = [ lib.maintainers.Profpatsch ];
    longDescription = ''
      When this script is loaded into mpv, you can hit Alt+W to mark the beginning
      and Alt+W again to mark the end of the clip. Then a settings window opens.
--- a/pkgs/build-support/emacs/buffer.nix
+++ b/pkgs/build-support/emacs/buffer.nix
@ -4,7 +4,8 @@
 { lib, writeText, inherit-local }:

 rec {
-  withPackages = pkgs: let
+  withPackages = pkgs': let
+      pkgs = builtins.filter (x: x != null) pkgs';
      extras = map (x: x.emacsBufferSetup pkgs) (builtins.filter (builtins.hasAttr "emacsBufferSetup") pkgs);
    in writeText "dir-locals.el" ''
      (require 'inherit-local "${inherit-local}/share/emacs/site-lisp/elpa/inherit-local-${inherit-local.version}/inherit-local.elc")
--- a/pkgs/build-support/setup-hooks/gog-unpack.sh
+++ b/pkgs/build-support/setup-hooks/gog-unpack.sh
@ -0,0 +1,11 @@
+unpackPhase="unpackGog"
+
+unpackGog() {
+    runHook preUnpackGog
+
+    innoextract --silent --extract --exclude-temp "${src}"
+
+    find . -depth -print -execdir rename -f 'y/A-Z/a-z/' '{}' \;
+
+    runHook postUnpackGog
+}
--- a/pkgs/data/documentation/bgnet/default.nix
+++ b/pkgs/data/documentation/bgnet/default.nix
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
    homepage = https://beej.us/guide/bgnet/;
    license = lib.licenses.unfree;

-    maintainers = with lib.maintainers; [ profpatsch ];
+    maintainers = with lib.maintainers; [ Profpatsch ];
  };
 }
--- a/pkgs/data/documentation/mustache-spec/default.nix
+++ b/pkgs/data/documentation/mustache-spec/default.nix
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {

    homepage = http://mustache.github.io/;
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ profpatsch ];
+    maintainers = with lib.maintainers; [ Profpatsch ];
    platforms = lib.platforms.all;
  };
 }
--- a/pkgs/data/fonts/fira-code/symbols.nix
+++ b/pkgs/data/fonts/fira-code/symbols.nix
@ -20,7 +20,7 @@ fetchzip {
      See https://github.com/tonsky/FiraCode/issues/211.
    '';
    license = licenses.ofl;
-    maintainers = [ maintainers.profpatsch ];
+    maintainers = [ maintainers.Profpatsch ];
    homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632";
  };
 }
--- a/pkgs/data/fonts/hasklig/default.nix
+++ b/pkgs/data/fonts/hasklig/default.nix
@ -20,6 +20,6 @@ in fetchzip {
    description = "A font with ligatures for Haskell code based off Source Code Pro";
    license = licenses.ofl;
    platforms = platforms.all;
-    maintainers = with maintainers; [ davidrusu profpatsch ];
+    maintainers = with maintainers; [ davidrusu Profpatsch ];
  };
 }
--- a/pkgs/data/fonts/league-of-moveable-type/default.nix
+++ b/pkgs/data/fonts/league-of-moveable-type/default.nix
@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
    license = stdenv.lib.licenses.ofl;

    platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ bergey profpatsch ];
+    maintainers = with stdenv.lib.maintainers; [ bergey Profpatsch ];
  };
 }
--- a/pkgs/data/fonts/raleway/default.nix
+++ b/pkgs/data/fonts/raleway/default.nix
@ -35,6 +35,6 @@ in fetchzip {
    homepage = https://github.com/impallari/Raleway;
    license = stdenv.lib.licenses.ofl;

-    maintainers = with stdenv.lib.maintainers; [ profpatsch ];
+    maintainers = with stdenv.lib.maintainers; [ Profpatsch ];
  };
 }
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel.nix
@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
 , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification
 , makeWrapper, xfce4mixer, hicolor_icon_theme
-, withGtk3 ? false, gtk3, gettext
+, withGtk3 ? false, gtk3, gettext, glib_networking
 }:
 let
  inherit (stdenv.lib) optional;
@ -40,7 +40,8 @@ stdenv.mkDerivation rec {

  postInstall = ''
    wrapProgram "$out/bin/xfce4-panel" \
-      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
+      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules"
  '';

  enableParallelBuilding = true;
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
@ -5,11 +5,11 @@ stdenv.mkDerivation rec {
  name = "${p_name}-${ver_maj}.${ver_min}";
  p_name  = "xfce4-weather-plugin";
  ver_maj = "0.8";
-  ver_min = "7";
+  ver_min = "10";

  src = fetchurl {
    url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "1c35iqqiphazkfdabbjdynk0qkc3r8vxhmk2jc6dkiv8d08727h7";
+    sha256 = "1f7ac2zr5s5w6krdpgsq252wxhhmcblia3j783132ilh8k246vgf";
  };

  nativeBuildInputs = [ pkgconfig intltool ];
--- a/pkgs/development/arduino/platformio/chrootenv.nix
+++ b/pkgs/development/arduino/platformio/chrootenv.nix
@ -1,26 +1,21 @@
-{ lib, buildFHSUserEnv, platformio, stdenv }:
-
+{ stdenv, lib, buildFHSUserEnv
+}:
+let
+  pio-pkgs = pkgs: (with pkgs;
+    [
+      python27Packages.python
+      python27Packages.setuptools
+      python27Packages.pip
+      python27Packages.bottle
+      python27Packages.platformio
+      zlib
+    ]);
+in
 buildFHSUserEnv {
  name = "platformio";

-  targetPkgs = pkgs: (with pkgs;
-    [
-      python27Packages.python
-      python27Packages.setuptools
-      python27Packages.pip
-      python27Packages.bottle
-      python27Packages.platformio
-      zlib
-    ]);
-  multiPkgs = pkgs: (with pkgs;
-    [
-      python27Packages.python
-      python27Packages.setuptools
-      python27Packages.pip
-      python27Packages.bottle
-      python27Packages.platformio
-      zlib
-    ]);
+  targetPkgs = pio-pkgs;
+  multiPkgs = pio-pkgs;

  meta = with stdenv.lib; {
    description = "An open source ecosystem for IoT development";
--- a/pkgs/development/compilers/purescript/psc-package/default.nix
+++ b/pkgs/development/compilers/purescript/psc-package/default.nix
@ -22,5 +22,5 @@ mkDerivation rec {

  description = "An experimental package manager for PureScript";
  license = licenses.bsd3;
-  maintainers = with lib.maintainers; [ profpatsch ];
+  maintainers = with lib.maintainers; [ Profpatsch ];
 }
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@ -86,7 +86,7 @@ stdenv.mkDerivation {

    # Disable fragile tests.
    rm -vr src/test/run-make/linker-output-non-utf8 || true
-    rm -vr src/test/run-make/issue-26092.rs || true
+    rm -vr src/test/run-make/issue-26092 || true

    # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835
    rm -vr src/test/run-pass/issue-36023.rs || true
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -950,7 +950,7 @@ self: super: {
  ChasingBottoms = dontCheck super.ChasingBottoms;

  # Add support for https://github.com/haskell-hvr/multi-ghc-travis.
-  multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis { ShellCheck = self.ShellCheck_0_4_6; };
+  multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {};

  # https://github.com/yesodweb/Shelly.hs/issues/162
  shelly = dontCheck super.shelly;
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@ -61,7 +61,7 @@ self: super: {
  ##       callStackDoc, called at compiler/utils/Outputable.hs:1150:37 in ghc:Outputable
  ##       pprPanic, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1013:16 in main:Haddock.Interface.Create
  ## Please report this as a GHC bug:  http://www.haskell.org/ghc/reportabug
-  hspec = dontHaddock (dontCheck super.hspec_2_4_7);        # test suite causes an infinite loop
+  hspec = dontHaddock (dontCheck super.hspec_2_4_8);        # test suite causes an infinite loop

  ## Setup: Encountered missing dependencies:
  ## QuickCheck >=2.3 && <2.10
@ -88,7 +88,7 @@ self: super: {
  ##       from the context: a
  constraints = super.constraints_0_10;

-  hspec-core = overrideCabal super.hspec-core_2_4_7 (drv: {
+  hspec-core = overrideCabal super.hspec-core_2_4_8 (drv: {
    ## Needs bump to a versioned attribute
    ## 
    ##     • No instance for (Semigroup Summary)
@ -102,7 +102,7 @@ self: super: {
  ## breaks hspec:
  ## Setup: Encountered missing dependencies:
  ## hspec-discover ==2.4.7
-  hspec-discover = super.hspec-discover_2_4_7;
+  hspec-discover = super.hspec-discover_2_4_8;

  ## Needs bump to a versioned attribute
  ## 
--- 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 10.4
+  # LTS Haskell 10.5
  - abstract-deque ==0.3
  - abstract-deque-tests ==0.3
  - abstract-par ==0.3.3
@ -64,7 +64,7 @@ default-package-overrides:
  - adler32 ==0.1.1.0
  - aern2-mp ==0.1.2.0
  - aern2-real ==0.1.1.0
-  - aeson ==1.2.3.0
+  - aeson ==1.2.4.0
  - aeson-better-errors ==0.9.1.0
  - aeson-casing ==0.1.0.5
  - aeson-compat ==0.3.7.1
@ -256,8 +256,9 @@ default-package-overrides:
  - bencode ==0.6.0.0
  - bento ==0.1.0
  - between ==0.11.0.0
+  - bhoogle ==0.1.2.5
  - bibtex ==0.1.0.6
-  - bifunctors ==5.5
+  - bifunctors ==5.5.2
  - bimap ==0.3.3
  - bimap-server ==0.1.0.1
  - binary-bits ==0.5
@ -305,7 +306,7 @@ default-package-overrides:
  - blaze-markup ==0.8.2.0
  - blaze-svg ==0.3.6.1
  - blaze-textual ==0.2.1.0
-  - bloodhound ==0.15.0.1
+  - bloodhound ==0.15.0.2
  - bloomfilter ==2.0.1.0
  - blosum ==0.1.1.4
  - bmp ==1.2.6.3
@ -348,10 +349,10 @@ default-package-overrides:
  - bzlib-conduit ==0.2.1.5
  - c2hs ==0.28.3
  - Cabal ==2.0.1.1
-  - cabal-doctest ==1.0.5
+  - cabal-doctest ==1.0.6
  - cabal-file-th ==0.2.4
  - cabal-rpm ==0.12
-  - cabal-toolkit ==0.0.4
+  - cabal-toolkit ==0.0.5
  - cache ==0.1.0.1
  - cairo ==0.13.4.2
  - calendar-recycling ==0.0
@ -428,7 +429,7 @@ default-package-overrides:
  - combinatorial ==0.0
  - comfort-graph ==0.0.2.1
  - commutative ==0.0.1.4
-  - comonad ==5.0.2
+  - comonad ==5.0.3
  - comonads-fd ==4.0
  - comonad-transformers ==4.0
  - compact ==0.1.0.1
@ -439,19 +440,19 @@ default-package-overrides:
  - composable-associations-aeson ==0.1.0.0
  - composition ==1.0.2.1
  - composition-extra ==2.0.0
-  - concise ==0.1.0.0
+  - concise ==0.1.0.1
  - concurrency ==1.2.3.0
  - concurrent-extra ==0.7.0.11
-  - concurrent-output ==1.10.2
+  - concurrent-output ==1.10.3
  - concurrent-split ==0.0.1
  - concurrent-supply ==0.1.8
  - cond ==0.4.1.1
  - conduit ==1.2.13
  - conduit-algorithms ==0.0.7.1
  - conduit-combinators ==1.1.2
-  - conduit-connection ==0.1.0.3
+  - conduit-connection ==0.1.0.4
  - conduit-extra ==1.2.3.2
-  - conduit-iconv ==0.1.1.2
+  - conduit-iconv ==0.1.1.3
  - conduit-parse ==0.1.2.2
  - conduit-throttle ==0.3.1.0
  - ConfigFile ==1.1.4
@ -508,7 +509,7 @@ default-package-overrides:
  - crypt-sha512 ==0
  - csp ==1.3.1
  - css-syntax ==0.0.5
-  - css-text ==0.1.2.2
+  - css-text ==0.1.3.0
  - csv ==0.1.2
  - csv-conduit ==0.6.7
  - ctrie ==0.2
@ -560,7 +561,7 @@ default-package-overrides:
  - data-textual ==0.3.0.2
  - data-tree-print ==0.1.0.0
  - dataurl ==0.1.0.0
-  - DAV ==1.3.1
+  - DAV ==1.3.2
  - dawg-ord ==0.5.1.0
  - dbcleaner ==0.1.3
  - dbus ==0.10.15
@ -581,7 +582,7 @@ default-package-overrides:
  - dhall-bash ==1.0.6
  - dhall-json ==1.0.9
  - dhall-nix ==1.0.9
-  - dhall-text ==1.0.4
+  - dhall-text ==1.0.5
  - diagrams ==1.4
  - diagrams-builder ==0.8.0.2
  - diagrams-cairo ==1.4
@ -607,7 +608,7 @@ default-package-overrides:
  - disk-free-space ==0.1.0.1
  - disposable ==0.2.0.4
  - distance ==0.1.0.0
-  - distributed-closure ==0.3.4.0
+  - distributed-closure ==0.3.5
  - distributed-process ==0.7.3
  - distributed-process-simplelocalnet ==0.2.4
  - distributed-process-tests ==0.4.11
@ -709,7 +710,7 @@ default-package-overrides:
  - eventstore ==0.15.0.2
  - every ==0.0.1
  - exact-combinatorics ==0.2.0.8
-  - exact-pi ==0.4.1.2
+  - exact-pi ==0.4.1.3
  - exceptional ==0.3.0.0
  - exception-mtl ==0.4.0.1
  - exceptions ==0.8.3
@ -731,7 +732,7 @@ default-package-overrides:
  - fasta ==0.10.4.2
  - fast-builder ==0.0.1.0
  - fast-digits ==0.2.1.0
-  - fast-logger ==2.4.10
+  - fast-logger ==2.4.11
  - fast-math ==1.0.2
  - fb ==1.1.1
  - fclabels ==2.0.3.2
@ -773,7 +774,7 @@ default-package-overrides:
  - focus ==0.1.5.2
  - fold-debounce ==0.2.0.6
  - fold-debounce-conduit ==0.1.0.5
-  - foldl ==1.3.5
+  - foldl ==1.3.7
  - folds ==0.7.4
  - follow-file ==0.0.2
  - FontyFruity ==0.5.3.3
@ -788,7 +789,7 @@ default-package-overrides:
  - Frames ==0.3.0.2
  - free ==4.12.4
  - freenect ==1.2.1
-  - freer-simple ==1.0.0.0
+  - freer-simple ==1.0.1.1
  - freetype2 ==0.1.2
  - free-vl ==0.1.4
  - friday ==0.2.3.1
@ -802,7 +803,7 @@ default-package-overrides:
  - funcmp ==1.8
  - functor-classes-compat ==1
  - fuzzcheck ==0.1.1
-  - fuzzyset ==0.1.0.4
+  - fuzzyset ==0.1.0.6
  - gauge ==0.1.3
  - gd ==3000.7.3
  - gdax ==0.6.0.0
@ -818,7 +819,7 @@ default-package-overrides:
  - generics-sop ==0.3.2.0
  - generics-sop-lens ==0.1.2.1
  - generic-xmlpickler ==0.1.0.5
-  - geniplate-mirror ==0.7.5
+  - geniplate-mirror ==0.7.6
  - genvalidity ==0.4.0.4
  - genvalidity-aeson ==0.1.0.0
  - genvalidity-bytestring ==0.1.0.0
@ -840,15 +841,15 @@ default-package-overrides:
  - ghc-compact ==0.1.0.0
  - ghc-core ==0.5.6
  - ghc-events ==0.7.0
-  - ghc-exactprint ==0.5.5.0
-  - ghcid ==0.6.9
+  - ghc-exactprint ==0.5.6.0
+  - ghcid ==0.6.10
  - ghcjs-base-stub ==0.1.0.4
  - ghcjs-codemirror ==0.0.0.1
  - ghcjs-dom ==0.9.2.0
  - ghcjs-dom-jsaddle ==0.9.2.0
  - ghcjs-perch ==0.3.3.2
  - ghc-paths ==0.1.0.9
-  - ghc-prof ==1.4.0.4
+  - ghc-prof ==1.4.1
  - ghc-syb-utils ==0.2.3.3
  - ghc-tcplugins-extra ==0.2.2
  - ghc-typelits-extra ==0.2.4
@ -864,7 +865,7 @@ default-package-overrides:
  - giphy-api ==0.5.2.0
  - git ==0.2.1
  - github ==0.18
-  - github-release ==1.1.2
+  - github-release ==1.1.3
  - github-types ==0.2.1
  - github-webhook-handler ==0.0.8
  - github-webhook-handler-snap ==0.0.7
@ -1027,12 +1028,12 @@ default-package-overrides:
  - hamlet ==1.2.0
  - HandsomeSoup ==0.4.2
  - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.1
+  - hapistrano ==0.3.5.2
  - happstack-hsp ==7.3.7.3
  - happstack-jmacro ==7.0.12
  - happstack-server ==7.5.0.1
-  - happstack-server-tls ==7.1.6.4
-  - happy ==1.19.8
+  - happstack-server-tls ==7.1.6.5
+  - happy ==1.19.9
  - harp ==0.4.3
  - hasbolt ==0.1.3.0
  - hashable ==1.2.6.1
@ -1094,7 +1095,7 @@ default-package-overrides:
  - heaps ==0.3.6
  - heatshrink ==0.1.0.0
  - hebrew-time ==0.1.1
-  - hedgehog ==0.5.1
+  - hedgehog ==0.5.2
  - hedgehog-quickcheck ==0.1
  - hedis ==0.9.12
  - here ==1.2.12
@ -1144,13 +1145,13 @@ default-package-overrides:
  - hosc ==0.16
  - hostname ==1.0
  - hostname-validate ==1.0.0
-  - hourglass ==0.2.10
+  - hourglass ==0.2.11
  - hourglass-orphans ==0.1.0.0
  - hp2pretty ==0.8.0.2
  - hpack ==0.21.2
  - hpc-coveralls ==1.0.10
  - HPDF ==1.4.10
-  - hpio ==0.9.0.3
+  - hpio ==0.9.0.5
  - hpp ==0.5.1
  - hpqtypes ==1.5.1.1
  - hprotoc ==2.4.6
@ -1162,12 +1163,12 @@ default-package-overrides:
  - hsb2hs ==0.3.1
  - hs-bibutils ==6.2.0.1
  - hscolour ==1.24.2
-  - hsdns ==1.7
+  - hsdns ==1.7.1
  - hsebaysdk ==0.4.0.0
  - hse-cpp ==0.2
  - hsemail ==2
-  - HSet ==0.0.1
  - hset ==2.2.0
+  - HSet ==0.0.1
  - hsexif ==0.6.1.5
  - hs-GeoIP ==0.3
  - hsignal ==0.2.7.5
@ -1203,7 +1204,7 @@ default-package-overrides:
  - hstatsd ==0.1
  - HStringTemplate ==0.8.6
  - HSvm ==0.1.0.3.22
-  - hsx2hs ==0.14.1.1
+  - hsx2hs ==0.14.1.2
  - hsx-jmacro ==7.3.8
  - hsyslog ==5.0.1
  - hsyslog-udp ==0.2.0
@ -1216,15 +1217,15 @@ default-package-overrides:
  - htoml ==1.0.0.3
  - HTTP ==4000.3.9
  - http2 ==1.6.3
-  - http-api-data ==0.3.7.1
-  - http-client ==0.5.9
+  - http-api-data ==0.3.7.2
+  - http-client ==0.5.10
  - http-client-openssl ==0.2.1.1
-  - http-client-tls ==0.3.5.1
+  - http-client-tls ==0.3.5.3
  - http-common ==0.8.2.0
  - http-conduit ==2.2.4
  - http-date ==0.0.6.1
  - http-link-header ==1.0.3
-  - http-media ==0.7.1.1
+  - http-media ==0.7.1.2
  - http-reverse-proxy ==0.4.5
  - http-streams ==0.8.5.5
  - http-types ==0.9.1
@ -1274,7 +1275,7 @@ default-package-overrides:
  - IfElse ==0.85
  - iff ==0.0.6
  - ignore ==0.1.1.0
-  - ihs ==0.1.0.1
+  - ihs ==0.1.0.2
  - ilist ==0.3.1.0
  - imagesize-conduit ==1.1
  - Imlib ==0.1.2
@ -1286,7 +1287,7 @@ default-package-overrides:
  - indentation-parsec ==0.0.0.1
  - indents ==0.4.0.1
  - inflections ==0.4.0.1
-  - influxdb ==1.2.2.2
+  - influxdb ==1.2.2.3
  - ini ==0.3.5
  - inline-c ==0.6.0.5
  - inline-c-cpp ==0.2.1.0
@ -1300,8 +1301,8 @@ default-package-overrides:
  - intern ==0.9.1.4
  - interpolate ==0.1.1
  - interpolatedstring-perl6 ==1.0.0
-  - interpolation ==0.1.0.2
  - Interpolation ==0.3.0
+  - interpolation ==0.1.0.2
  - IntervalMap ==0.5.3.1
  - intervals ==0.8.1
  - intro ==0.3.1.0
@ -1322,8 +1323,8 @@ default-package-overrides:
  - IPv6DB ==0.2.4
  - ipython-kernel ==0.9.0.1
  - irc ==0.6.1.0
-  - irc-client ==1.0.1.0
-  - irc-conduit ==0.2.2.4
+  - irc-client ==1.0.1.1
+  - irc-conduit ==0.2.2.5
  - irc-ctcp ==0.1.3.0
  - irc-dcc ==2.0.1
  - islink ==0.1.0.0
@ -1354,7 +1355,7 @@ default-package-overrides:
  - json-rpc-generic ==0.2.1.3
  - json-schema ==0.7.4.1
  - json-stream ==0.4.1.5
-  - JuicyPixels ==3.2.9.3
+  - JuicyPixels ==3.2.9.4
  - JuicyPixels-extra ==0.2.2
  - JuicyPixels-scale-dct ==0.1.1.2
  - justified-containers ==0.2.0.1
@ -1364,7 +1365,7 @@ default-package-overrides:
  - kanji ==3.0.2
  - kansas-comet ==0.4
  - katip ==0.5.2.0
-  - katip-elasticsearch ==0.4.0.3
+  - katip-elasticsearch ==0.4.0.4
  - katydid ==0.1.1.0
  - kawhi ==0.3.0
  - kdt ==0.2.4
@ -1386,7 +1387,7 @@ default-package-overrides:
  - language-haskell-extract ==0.2.4
  - language-java ==0.2.8
  - language-javascript ==0.6.0.10
-  - language-puppet ==1.3.13
+  - language-puppet ==1.3.14
  - lapack-carray ==0.0
  - lapack-ffi ==0.0
  - lapack-ffi-tools ==0.0.0.1
@ -1396,7 +1397,7 @@ default-package-overrides:
  - lattices ==1.7
  - lazyio ==0.1.0.4
  - lazysmallcheck ==0.6
-  - lca ==0.3
+  - lca ==0.3.1
  - leancheck ==0.7.0
  - leapseconds-announced ==2017.1.0.1
  - lens ==4.15.4
@ -1448,10 +1449,10 @@ default-package-overrides:
  - log-elasticsearch ==0.9.1.0
  - logfloat ==0.13.3.3
  - logger-thread ==0.1.0.2
-  - logging-effect ==1.2.1
-  - logging-effect-extra ==1.2.1
-  - logging-effect-extra-file ==1.1.1
-  - logging-effect-extra-handler ==1.1.1
+  - logging-effect ==1.2.3
+  - logging-effect-extra ==1.2.2
+  - logging-effect-extra-file ==1.1.2
+  - logging-effect-extra-handler ==1.1.2
  - logging-facade ==0.3.0
  - logging-facade-syslog ==1
  - logict ==0.6.0.2
@ -1498,7 +1499,7 @@ default-package-overrides:
  - megaparsec ==6.3.0
  - mega-sdist ==0.3.0.6
  - memory ==0.14.11
-  - MemoTrie ==0.6.8
+  - MemoTrie ==0.6.9
  - mercury-api ==0.1.0.1
  - mersenne-random-pure64 ==0.2.2.0
  - messagepack ==0.5.4
@ -1520,7 +1521,7 @@ default-package-overrides:
  - midi ==0.2.2.1
  - midi-music-box ==0.0.0.4
  - mighty-metropolis ==1.2.0
-  - milena ==0.5.2.0
+  - milena ==0.5.2.1
  - mime-mail ==0.4.14
  - mime-mail-ses ==0.4.0.0
  - mime-types ==0.1.0.7
@ -1556,7 +1557,7 @@ default-package-overrides:
  - monadloc ==0.7.1
  - monad-logger ==0.3.28.1
  - monad-logger-json ==0.1.0.0
-  - monad-logger-prefix ==0.1.6
+  - monad-logger-prefix ==0.1.7
  - monad-logger-syslog ==0.1.4.0
  - monad-loops ==0.4.3
  - monad-memo ==0.4.1
@ -1578,7 +1579,7 @@ default-package-overrides:
  - monad-time ==0.2
  - monad-unlift ==0.2.0
  - monad-unlift-ref ==0.2.1
-  - mongoDB ==2.3.0.1
+  - mongoDB ==2.3.0.2
  - monoidal-containers ==0.3.0.2
  - monoid-extras ==0.4.2
  - monoid-subclasses ==0.4.4
@ -1599,7 +1600,7 @@ default-package-overrides:
  - murmur-hash ==0.1.0.9
  - MusicBrainz ==0.3.1
  - mustache ==2.3.0
-  - mutable-containers ==0.3.3
+  - mutable-containers ==0.3.4
  - mwc-probability ==1.3.0
  - mwc-random ==0.13.6.0
  - mwc-random-accelerate ==0.1.0.0
@ -1614,7 +1615,7 @@ default-package-overrides:
  - nano-erl ==0.1.0.1
  - nanospec ==0.2.2
  - naqsha ==0.2.0.1
-  - nats ==1.1.1
+  - nats ==1.1.2
  - natural-sort ==0.1.2
  - natural-transformation ==0.4
  - ndjson-conduit ==0.1.0.5
@ -1630,7 +1631,7 @@ default-package-overrides:
  - network-anonymous-i2p ==0.10.0
  - network-anonymous-tor ==0.11.0
  - network-attoparsec ==0.12.2
-  - network-carbon ==1.0.10
+  - network-carbon ==1.0.11
  - network-conduit-tls ==1.2.2
  - network-house ==0.1.0.2
  - network-info ==0.2.0.9
@ -1684,7 +1685,7 @@ default-package-overrides:
  - once ==0.2
  - one-liner ==0.9.2
  - OneTuple ==0.2.1
-  - online ==0.2.0
+  - online ==0.2.1.0
  - Only ==0.1
  - oo-prototypes ==0.1.0.0
  - opaleye ==0.6.0.0
@ -1721,7 +1722,7 @@ default-package-overrides:
  - parallel ==3.2.1.1
  - parallel-io ==0.3.3
  - parseargs ==0.2.0.8
-  - parsec ==3.1.11
+  - parsec ==3.1.13.0
  - parsec-numeric ==0.1.0.0
  - ParsecTools ==0.0.2.0
  - parser-combinators ==0.4.0
@ -1760,7 +1761,7 @@ default-package-overrides:
  - persistent-postgresql ==2.6.3
  - persistent-refs ==0.4
  - persistent-sqlite ==2.6.4
-  - persistent-template ==2.5.3
+  - persistent-template ==2.5.3.1
  - pgp-wordlist ==0.1.0.2
  - pg-transact ==0.1.0.1
  - phantom-state ==0.2.1.2
@ -1775,7 +1776,7 @@ default-package-overrides:
  - pipes-attoparsec ==0.5.1.5
  - pipes-bytestring ==2.1.6
  - pipes-category ==0.3.0.0
-  - pipes-concurrency ==2.0.8
+  - pipes-concurrency ==2.0.9
  - pipes-csv ==1.4.3
  - pipes-extras ==1.0.12
  - pipes-fastx ==0.3.0.0
@ -1842,7 +1843,7 @@ default-package-overrides:
  - primitive ==0.6.3.0
  - printcess ==0.1.0.3
  - probability ==0.2.5.1
-  - process-extras ==0.7.3
+  - process-extras ==0.7.4
  - product-isomorphic ==0.0.3.1
  - product-profunctors ==0.8.0.3
  - profiterole ==0.1
@ -1876,7 +1877,7 @@ default-package-overrides:
  - pure-io ==0.2.1
  - pureMD5 ==2.1.3
  - purescript-bridge ==0.11.1.2
-  - pusher-http-haskell ==1.5.1.0
+  - pusher-http-haskell ==1.5.1.2
  - pwstore-fast ==2.4.4
  - qchas ==1.0.1.0
  - qm-interpolated-string ==0.2.1.0
@ -1885,7 +1886,7 @@ default-package-overrides:
  - QuickCheck ==2.10.1
  - quickcheck-arbitrary-adt ==0.2.0.0
  - quickcheck-assertions ==0.3.0
-  - quickcheck-classes ==0.3.1
+  - quickcheck-classes ==0.3.2
  - quickcheck-combinators ==0.0.2
  - quickcheck-instances ==0.3.16.1
  - quickcheck-io ==0.2.0
@ -1979,7 +1980,7 @@ default-package-overrides:
  - rest-wai ==0.2.0.1
  - result ==0.2.6.0
  - rethinkdb-client-driver ==0.0.25
-  - retry ==0.7.5.1
+  - retry ==0.7.6.0
  - rev-state ==0.1.2
  - rfc5051 ==0.1.0.3
  - riak ==1.1.2.3
@ -2007,8 +2008,8 @@ default-package-overrides:
  - say ==0.1.0.0
  - sbp ==2.3.6
  - sbv ==7.4
-  - SCalendar ==1.1.0
  - scalendar ==1.2.0
+  - SCalendar ==1.1.0
  - scalpel ==0.5.1
  - scalpel-core ==0.5.1
  - scanner ==0.2
@ -2029,11 +2030,11 @@ default-package-overrides:
  - selda-sqlite ==0.1.6.0
  - semigroupoid-extras ==5
  - semigroupoids ==5.2.1
-  - semigroups ==0.18.3
+  - semigroups ==0.18.4
  - semiring-simple ==1.0.0.1
  - semver ==0.3.3.1
  - sendfile ==0.7.9
-  - sensu-run ==0.4.0.3
+  - sensu-run ==0.4.0.4
  - seqalign ==0.2.0.4
  - seqloc ==0.6.1.1
  - serf ==0.1.1.0
@ -2079,7 +2080,7 @@ default-package-overrides:
  - SHA ==1.6.4.2
  - shake ==0.16
  - shake-language-c ==0.11.0
-  - shakespeare ==2.0.14.1
+  - shakespeare ==2.0.15
  - shell-conduit ==4.6.1
  - shell-escape ==0.2.0
  - shelly ==1.7.0.1
@ -2092,7 +2093,7 @@ default-package-overrides:
  - simple ==0.11.2
  - simple-log ==0.9.3
  - simple-reflect ==0.3.2
-  - simple-sendfile ==0.2.26
+  - simple-sendfile ==0.2.27
  - simple-session ==0.10.1.1
  - simple-templates ==0.8.0.1
  - singleton-bool ==0.1.2.0
@ -2156,7 +2157,7 @@ default-package-overrides:
  - StateVar ==1.1.0.4
  - stateWriter ==0.2.10
  - statistics ==0.14.0.2
-  - stm ==2.4.4.1
+  - stm ==2.4.5.0
  - stm-chans ==3.0.0.4
  - stm-conduit ==3.0.0
  - stm-containers ==0.2.16
@ -2179,7 +2180,7 @@ default-package-overrides:
  - Stream ==0.4.7.2
  - streaming ==0.2.0.0
  - streaming-bytestring ==0.1.5
-  - streaming-commons ==0.1.18
+  - streaming-commons ==0.1.19
  - streamly ==0.1.0
  - streamproc ==1.6.2
  - streams ==3.3
@ -2211,7 +2212,7 @@ default-package-overrides:
  - svg-tree ==0.6.2.1
  - swagger ==0.3.0
  - swagger2 ==2.2
-  - swagger-petstore ==0.0.1.7
+  - swagger-petstore ==0.0.1.8
  - swish ==0.9.1.10
  - syb ==0.7
  - syb-with-class ==0.6.1.8
@ -2233,7 +2234,7 @@ default-package-overrides:
  - tar-conduit ==0.1.1
  - tardis ==0.4.1.0
  - tasty ==0.11.3
-  - tasty-ant-xml ==1.1.2
+  - tasty-ant-xml ==1.1.3
  - tasty-auto ==0.2.0.0
  - tasty-dejafu ==0.7.1.1
  - tasty-discover ==4.1.3
@ -2247,7 +2248,7 @@ default-package-overrides:
  - tasty-kat ==0.0.3
  - tasty-program ==1.0.5
  - tasty-quickcheck ==0.9.1
-  - tasty-rerun ==1.1.9
+  - tasty-rerun ==1.1.10
  - tasty-silver ==3.1.11
  - tasty-smallcheck ==0.8.1
  - tasty-stats ==0.2.0.3
@ -2282,7 +2283,7 @@ default-package-overrides:
  - text-generic-pretty ==1.2.1
  - text-icu ==0.7.0.1
  - text-latin1 ==0.3
-  - text-ldap ==0.1.1.10
+  - text-ldap ==0.1.1.11
  - textlocal ==0.1.0.5
  - text-manipulate ==0.2.0.1
  - text-metrics ==0.3.0
@ -2301,7 +2302,7 @@ default-package-overrides:
  - these ==0.7.4
  - th-expand-syns ==0.4.4.0
  - th-extras ==0.0.0.4
-  - th-lift ==0.7.7
+  - th-lift ==0.7.8
  - th-lift-instances ==0.1.11
  - th-orphans ==0.13.5
  - thread-hierarchy ==0.3.0.0
@ -2385,7 +2386,7 @@ default-package-overrides:
  - type-level-kv-list ==1.1.0
  - type-level-numbers ==0.1.1.1
  - typelits-witnesses ==0.2.3.0
-  - type-of-html ==1.3.2.1
+  - type-of-html ==1.3.3.0
  - type-operators ==0.1.0.4
  - type-spec ==0.3.0.1
  - typography-geometry ==1.0.0.1
@ -2409,8 +2410,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
@ -2465,7 +2466,7 @@ default-package-overrides:
  - vcswrapper ==0.1.6
  - vector ==0.12.0.1
  - vector-algorithms ==0.7.0.1
-  - vector-binary-instances ==0.2.3.5
+  - vector-binary-instances ==0.2.4
  - vector-buffer ==0.4.1
  - vector-builder ==0.3.4.1
  - vector-fftw ==0.1.3.8
@ -2504,7 +2505,7 @@ default-package-overrides:
  - wai-middleware-crowd ==0.1.4.2
  - wai-middleware-metrics ==0.2.4
  - wai-middleware-prometheus ==0.3.0
-  - wai-middleware-rollbar ==0.8.2
+  - wai-middleware-rollbar ==0.8.3
  - wai-middleware-static ==0.8.1
  - wai-middleware-throttle ==0.2.2.0
  - wai-predicates ==0.10.0
@ -2523,12 +2524,12 @@ default-package-overrides:
  - webdriver-angular ==0.1.11
  - webpage ==0.0.5
  - web-plugins ==0.2.9
-  - web-routes ==0.27.13
+  - web-routes ==0.27.14
  - web-routes-boomerang ==0.28.4.2
  - web-routes-happstack ==0.23.11
  - web-routes-hsp ==0.24.6.1
  - web-routes-th ==0.22.6.2
-  - web-routes-wai ==0.24.3
+  - web-routes-wai ==0.24.3.1
  - webrtc-vad ==0.1.0.3
  - websockets ==0.12.3.1
  - websockets-rpc ==0.6.0
@ -2542,7 +2543,7 @@ default-package-overrides:
  - Win32 ==2.5.4.1
  - Win32-notify ==0.3.0.3
  - wire-streams ==0.1.1.0
-  - withdependencies ==0.2.4.1
+  - withdependencies ==0.2.4.2
  - witherable ==0.2
  - with-location ==0.1.0
  - witness ==0.4
@ -2580,7 +2581,7 @@ default-package-overrides:
  - xeno ==0.3.2
  - xenstore ==0.1.1
  - xhtml ==3000.2.2
-  - xls ==0.1.0
+  - xls ==0.1.1
  - xlsx ==0.6.0
  - xlsx-tabular ==0.2.2
  - xml ==1.3.14
@ -2705,7 +2706,6 @@ extra-packages:
  - QuickCheck < 2                      # required by test-framework-quickcheck and its users
  - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
  - seqid-streams < 0.2                 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
-  - ShellCheck == 0.4.6                 # required by multi-ghc-travis
  - split < 0.2                         # newer versions don't work with GHC 6.12.3
  - tar < 0.4.2.0                       # later versions don't work with GHC < 7.6.x
  - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet
--- 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
@ -112,7 +112,7 @@ let
      sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"'';
    in pkgs.buildPackages.stdenv.mkDerivation {
      name = "cabal2nix-${name}";
-      nativeBuildInputs = [ pkgs.buildPackages.haskellPackages.cabal2nix ];
+      nativeBuildInputs = [ pkgs.buildPackages.cabal2nix ];
      preferLocalBuild = true;
      phases = ["installPhase"];
      LANG = "en_US.UTF-8";
--- a/pkgs/development/interpreters/python/build-python-package.nix
+++ b/pkgs/development/interpreters/python/build-python-package.nix
@ -6,7 +6,7 @@
 , wrapPython
 , setuptools
 , unzip
-, ensureNewerSourcesHook
+, ensureNewerSourcesForZipFilesHook
 , toPythonModule
 , namePrefix
 , bootstrapped-pip
@ -19,7 +19,7 @@ let
  wheel-specific = import ./build-python-package-wheel.nix { };
  common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; };
  mkPythonDerivation = import ./mk-python-derivation.nix {
-    inherit lib python wrapPython setuptools unzip ensureNewerSourcesHook toPythonModule namePrefix;
+    inherit lib python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix;
  };
 in

--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@ -5,7 +5,7 @@
 , wrapPython
 , setuptools
 , unzip
-, ensureNewerSourcesHook
+, ensureNewerSourcesForZipFilesHook
 # Whether the derivation provides a Python module or not.
 , toPythonModule
 , namePrefix
@ -69,7 +69,7 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [

  name = namePrefix + name;

-  nativeBuildInputs = [ (ensureNewerSourcesHook { year = "1980"; }) ]
+  nativeBuildInputs = [ ensureNewerSourcesForZipFilesHook ]
    ++ nativeBuildInputs;

  buildInputs = [ wrapPython ]
--- a/pkgs/development/libraries/bctoolbox/default.nix
+++ b/pkgs/development/libraries/bctoolbox/default.nix
@ -2,13 +2,13 @@
 stdenv.mkDerivation rec {
  name = "${baseName}-${version}";
  baseName = "bctoolbox";
-  version = "0.2.0";
+  version = "0.6.0";
  buildInputs = [cmake mbedtls bcunit srtp];
  src = fetchFromGitHub {
    owner = "BelledonneCommunications";
    repo = "${baseName}";
    rev = "${version}";
-    sha256 = "09mjqdfjxy4jy1z68b2i99hgkbnhhk7vnbfhj9sdpd1p3jk2ha33";
+    sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909";
  };

  meta = {
--- a/pkgs/development/libraries/belcard/default.nix
+++ b/pkgs/development/libraries/belcard/default.nix
@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, belr }:
+
+stdenv.mkDerivation rec {
+  baseName = "belcard";
+  version = "1.0.2";
+  name = "${baseName}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "BelledonneCommunications";
+    repo = "${baseName}";
+    rev = "${version}";
+    sha256 = "1pwji83vpsdrfma24rnj3rz1x0a0g6zk3v4xjnip7zf2ys3zcnlk";
+  };
+
+  buildInputs = [ bctoolbox belr ];
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib;{
+    description = "Belcard is a C++ library to manipulate VCard standard format";
+    homepage = https://github.com/BelledonneCommunications/belcard;
+    license = licenses.lgpl21;
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@ -4,14 +4,14 @@

 stdenv.mkDerivation rec {
  baseName = "belle-sip";
-  version = "1.5.0";
+  version = "1.6.3";
  name = "${baseName}-${version}";

  src = fetchFromGitHub {
    owner = "BelledonneCommunications";
    repo = "${baseName}";
    rev = "${version}";
-    sha256 = "0hnm64hwgq003wicz6c485fryjfhi820fgin8ndknq60kvwxsrzn";
+    sha256 = "0q70db1klvhca1af29bm9paka3gyii5hfbzrj4178gclsg7cj8fk";
  };

  nativeBuildInputs = [ jre cmake ];
--- a/pkgs/development/libraries/belr/default.nix
+++ b/pkgs/development/libraries/belr/default.nix
@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }:
+
+stdenv.mkDerivation rec {
+  baseName = "belr";
+  version = "0.1.3";
+  name = "${baseName}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "BelledonneCommunications";
+    repo = "${baseName}";
+    rev = "${version}";
+    sha256 = "0mf8lsyq1z3b5p47c00lnwc8n7v9nzs1fd2g9c9hnz6fjd2ka44w";
+  };
+
+  buildInputs = [ bctoolbox ];
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib;{
+    description = "Belr is Belledonne Communications' language recognition library";
+    homepage = https://github.com/BelledonneCommunications/belr;
+    license = licenses.lgpl21;
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/development/libraries/bzrtp/default.nix
+++ b/pkgs/development/libraries/bzrtp/default.nix
@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, sqlite }:
+
+stdenv.mkDerivation rec {
+  baseName = "bzrtp";
+  version = "1.0.6";
+  name = "${baseName}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "BelledonneCommunications";
+    repo = "${baseName}";
+    rev = "${version}";
+    sha256 = "0438zzxp82bj5fmvqnwlljkgrz9ab5qm5lgpwwgmg1cp78bp2l45";
+  };
+
+  buildInputs = [ bctoolbox sqlite ];
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "BZRTP is an opensource implementation of ZRTP keys exchange protocol";
+    homepage = https://github.com/BelledonneCommunications/bzrtp;
+    license = licenses.lgpl21;
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@ -24,4 +24,8 @@ runCommand "fc-cache"

    mkdir -p $out
    fc-cache -sv
+
+    # This is not a cache dir in the normal sense -- it won't be automatically
+    # recreated.
+    rm "$out/CACHEDIR.TAG"
  ''
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@ -1,19 +1,26 @@
 { stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:

-stdenv.mkDerivation rec
-  { name = "grpc-1.8.3";
-    src = fetchurl
-      { url = "https://github.com/grpc/grpc/archive/v1.8.3.tar.gz";
-        sha256 = "14ichjllvhkbv8sjh9j5njnagpqw2sl12n41ga90jnj7qvfwwjy1";
-      };
-    nativeBuildInputs = [ cmake pkgconfig ];
-    buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
-    cmakeFlags =
-      [ "-DgRPC_ZLIB_PROVIDER=package"
-        "-DgRPC_CARES_PROVIDER=package"
-        "-DgRPC_SSL_PROVIDER=package"
-        "-DgRPC_PROTOBUF_PROVIDER=package"
-        "-DgRPC_GFLAGS_PROVIDER=package"
-      ];
-    enableParallelBuilds = true;
-  }
+stdenv.mkDerivation rec {
+  version = "1.9.1";
+  name = "grpc-${version}";
+  src = fetchurl {
+    url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz";
+    sha256 = "0h2w0dckxydngva9kl7dpilif8k9zi2ajnlanscr7s5kkza3dhps";
+  };
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
+  cmakeFlags =
+    [ "-DgRPC_ZLIB_PROVIDER=package"
+      "-DgRPC_CARES_PROVIDER=package"
+      "-DgRPC_SSL_PROVIDER=package"
+      "-DgRPC_PROTOBUF_PROVIDER=package"
+      "-DgRPC_GFLAGS_PROVIDER=package"
+    ];
+  enableParallelBuilds = true;
+
+  meta = with stdenv.lib; {
+    description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)";
+    license = licenses.asl20;
+    homepage = https://grpc.io/;
+  };
+}
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@ -1,8 +1,9 @@
 { stdenv, fetchurl, pkgconfig, expat, ncurses, pciutils, numactl
-, cairo, libX11
-, x11Support ? (!stdenv.isCygwin)
+, x11Support ? false, libX11 ? null, cairo ? null
 }:

+assert x11Support -> libX11 != null && cairo != null;
+
 with stdenv.lib;

 stdenv.mkDerivation rec {
--- a/pkgs/development/libraries/libclc/default.nix
+++ b/pkgs/development/libraries/libclc/default.nix
@ -1,17 +1,22 @@
-{ stdenv, fetchFromGitHub, python, llvm, clang }:
+{ stdenv, fetchFromGitHub, python, llvmPackages }:
+
+let
+  llvm = llvmPackages.llvm;
+  clang = llvmPackages.clang;
+in

 stdenv.mkDerivation {
-  name = "libclc-2017-02-25";
+  name = "libclc-2017-11-29";

  src = fetchFromGitHub {
    owner = "llvm-mirror";
    repo = "libclc";
-    rev = "17648cd846390e294feafef21c32c7106eac1e24";
-    sha256 = "1c20jyh3sdwd9r37zs4vvppmsx8vhf2xbx0cxsrc27bhx5245p0s";
+    rev = "d6384415ab854c68777dd77451aa2bc0d959da99";
+    sha256 = "10fqrlnqlknh58x7pfsbg9r07fblfg2mgq2m4fr1jbb836ncn3wh";
  };

  nativeBuildInputs = [ python ];
-  buildInputs = [ llvm ];
+  buildInputs = [ llvm clang ];

  postPatch = ''
    sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@ -1,22 +1,29 @@
 { stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm
 , libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp
 , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen
-, python, libXext, libmatroska, openssl
+, python, libXext, libmatroska, openssl, fetchpatch
 }:

 stdenv.mkDerivation rec {
  baseName = "mediastreamer2";
-  version = "2.14.0";
+  version = "2.16.1";
  name = "${baseName}-${version}";

  src = fetchFromGitHub {
    owner = "BelledonneCommunications";
    repo = "${baseName}";
    rev = "${version}";
-    sha256 = "1b59rzsaw54mhy4pz9hndmim4rgidkn7s6c4iyl34mz58lwxpmqp";
+    sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j";
  };

-  patches = [ ./plugins_dir.patch ];
+  patches = [
+    (fetchpatch {
+      name = "allow-build-without-git.patch";
+      url = "https://github.com/BelledonneCommunications/mediastreamer2/commit/de3a24b795d7a78e78eab6b974e7ec5abf2259ac.patch";
+      sha256 = "1zqkrab42n4dha0knfsyj4q0wc229ma125gk9grj67ps7r7ipscy";
+    })
+    ./plugins_dir.patch
+  ];

  nativeBuildInputs = [ pkgconfig intltool cmake doxygen python ];

--- a/pkgs/development/libraries/ocl-icd/default.nix
+++ b/pkgs/development/libraries/ocl-icd/default.nix
@ -9,14 +9,16 @@ stdenv.mkDerivation rec {
    sha256 = "0f14gpa13sdm0kzqv5yycp4pschbmi6n5fj7wl4ilspzsrqcgqr2";
  };

-  buildInputs = [ ruby opencl-headers ];
+  nativeBuildInputs = [ ruby ];
+
+  buildInputs = [ opencl-headers ];

  postPatch = ''
    sed -i 's,"/etc/OpenCL/vendors","${mesa_noglu.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c
  '';

  meta = with stdenv.lib; {
-    description = "OpenCL ICD Loader";
+    description = "OpenCL ICD Loader for ${opencl-headers.name}";
    homepage    = https://forge.imag.fr/projects/ocl-icd/;
    license     = licenses.bsd2;
    platforms = platforms.linux;
--- a/pkgs/development/libraries/opencl-headers/default.nix
+++ b/pkgs/development/libraries/opencl-headers/default.nix
@ -1,22 +1,24 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub
+, version # "12" for "1.2", "22" for "2.2" and so on
+}:

 stdenv.mkDerivation rec {
-  name = "opencl-headers-2.1-2016-11-29";
+  name = "opencl-headers-${version}-2017-07-18";

  src = fetchFromGitHub {
    owner = "KhronosGroup";
    repo = "OpenCL-Headers";
-    rev = "abb29588550c77f8340a6c3683531407013bf26b";
-    sha256 = "0zjznq65i4b2h4k36qfbbzq1acf2jdd9vygjv5az1yk7qgsp4jj7";
+    rev = "f039db6764d52388658ef15c30b2237bbda49803";
+    sha256 = "0z04i330zr8czak2624q71aajdcq7ly8mb5bgala5m235qjpsrh7";
  };

  installPhase = ''
    mkdir -p $out/include/CL
-    cp * $out/include/CL
+    cp opencl${version}/CL/* $out/include/CL
  '';

  meta = with stdenv.lib; {
-    description = "Khronos OpenCL headers";
+    description = "Khronos OpenCL headers version ${version}";
    homepage = https://www.khronos.org/registry/cl/;
    license = licenses.mit;
    platforms = platforms.unix;
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  baseName = "ortp";
-  version = "0.27.0";
+  version = "1.0.2";
  name = "${baseName}-${version}";

  src = fetchFromGitHub {
    owner = "BelledonneCommunications";
    repo = "${baseName}";
    rev = "${version}";
-    sha256 = "0gjaaph4pamay9gn1yn7ky5wyzhj93r53rwak7h8s48vf08fqyv7";
+    sha256 = "12cwv593bsdnxs0zfcp07vwyk7ghlz2wv7vdbs1ksv293w3vj2rv";
  };

  buildInputs = [ bctoolbox ];
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@ -1,13 +1,13 @@
 { stdenv, fetchurl, libjpeg, zlib, perl }:

-let version = "7.0.0";
+let version = "7.1.1";
 in
 stdenv.mkDerivation rec {
  name = "qpdf-${version}";

  src = fetchurl {
    url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
-    sha256 = "0py6p27fx4qrwq9mvcybna42b0bdi359x38lzmggxl5a9khqvl7y";
+    sha256 = "1ypjxm74dhn9c4mj027zzkh0z4kpw9xiqwh3pjmmghm502hby3ca";
  };

  nativeBuildInputs = [ perl ];
--- a/pkgs/development/libraries/udunits/default.nix
+++ b/pkgs/development/libraries/udunits/default.nix
@ -3,10 +3,10 @@
 }:

 stdenv.mkDerivation rec {
-    name = "udunits-2.2.24";
+    name = "udunits-2.2.26";
    src = fetchurl {
        url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz";
-        sha256 = "15bz2wv46wiwdzai8770gzy05prgj120x6j2hmihavv5y89cbfi0";
+        sha256 = "0v9mqw4drnkzkm57331ail6yvs9485jmi37s40lhvmf7r5lli3rn";
    };

    nativeBuildInputs = [ bison flex file ];
--- a/pkgs/development/libraries/unibilium/default.nix
+++ b/pkgs/development/libraries/unibilium/default.nix
@ -1,21 +1,21 @@
-{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig }:
+{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl }:

 stdenv.mkDerivation rec {
  name = "unibilium-${version}";

-  version = "1.2.1";
+  version = "2.0.0";

  src = fetchFromGitHub {
    owner = "mauke";
    repo = "unibilium";
    rev = "v${version}";
-    sha256 = "11mbfijdrvbmdlmxs8j4vij78ki0vna89yg3r9n9g1i6j45hiq2r";
+    sha256 = "1wa9a32wzqnxqh1jh554afj13dzjr6mw2wzqzw8d08nza9pg2ra2";
  };

  makeFlags = [ "PREFIX=$(out)" ]
    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig perl ];
  buildInputs = [ libtool ];

  meta = with lib; {
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@ -24,8 +24,8 @@ let lispPackages = rec {
      quicklispdist = pkgs.fetchurl {
        # Will usually be replaced with a fresh version anyway, but needs to be
        # a valid distinfo.txt
-        url = "http://beta.quicklisp.org/dist/quicklisp/2017-07-25/distinfo.txt";
-        sha256 = "165fd4a10zc3mxyy7wr4i2r3n6fzd1wd2hgzfyp32xlc41qj2ajf";
+        url = "http://beta.quicklisp.org/dist/quicklisp/2018-01-31/distinfo.txt";
+        sha256 = "0z28yz205cl8pa8lbflw9072mywg69jx0gf091rhx2wjjf9h14qy";
      };
      buildPhase = '' true; '';
      postInstall = ''
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''_3bmd'';
-  version = ''20161204-git'';
+  version = ''20171019-git'';

  description = ''markdown processor in CL using esrap parser.'';

  deps = [ args."alexandria" args."esrap" args."split-sequence" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz'';
-    sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx'';
+    url = ''http://beta.quicklisp.org/archive/3bmd/2017-10-19/3bmd-20171019-git.tgz'';
+    sha256 = ''1lrh1ypn9wrjcayi9vc706knac1vsxlrzlsxq73apdc7jx4wzywz'';
  };

  packageName = "3bmd";
@ -18,12 +18,12 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256
-    158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL
-    http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5
-    b80864c74437e0cfb66663e9bbf08fed NAME 3bmd FILENAME _3bmd DEPS
+    1lrh1ypn9wrjcayi9vc706knac1vsxlrzlsxq73apdc7jx4wzywz URL
+    http://beta.quicklisp.org/archive/3bmd/2017-10-19/3bmd-20171019-git.tgz MD5
+    d691962a511f2edc15f4fc228ecdf546 NAME 3bmd FILENAME _3bmd DEPS
    ((NAME alexandria FILENAME alexandria) (NAME esrap FILENAME esrap)
     (NAME split-sequence FILENAME split-sequence))
-    DEPENDENCIES (alexandria esrap split-sequence) VERSION 20161204-git
+    DEPENDENCIES (alexandria esrap split-sequence) VERSION 20171019-git
    SIBLINGS
    (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables
     3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube)
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''alexandria'';
-  version = ''20170630-git'';
+  version = ''20170830-git'';

  description = ''Alexandria is a collection of portable public domain utilities.'';

  deps = [ ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz'';
-    sha256 = ''1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis'';
+    url = ''http://beta.quicklisp.org/archive/alexandria/2017-08-30/alexandria-20170830-git.tgz'';
+    sha256 = ''0vprl8kg5qahwp8zyc26bk0qpdynga9hbv5qnlvk3cclfpvm8kl9'';
  };

  packageName = "alexandria";
@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM alexandria DESCRIPTION
    Alexandria is a collection of portable public domain utilities. SHA256
-    1ch7987ijs5gz5dk3i02bqgb2bn7s9p3sfsrwq4fp1sxykwr9fis URL
-    http://beta.quicklisp.org/archive/alexandria/2017-06-30/alexandria-20170630-git.tgz
-    MD5 ce5427881c909981192f870cb52ff59f NAME alexandria FILENAME alexandria
-    DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (alexandria-tests)
+    0vprl8kg5qahwp8zyc26bk0qpdynga9hbv5qnlvk3cclfpvm8kl9 URL
+    http://beta.quicklisp.org/archive/alexandria/2017-08-30/alexandria-20170830-git.tgz
+    MD5 13ea5af7055094a87dec1e45090f894a NAME alexandria FILENAME alexandria
+    DEPS NIL DEPENDENCIES NIL VERSION 20170830-git SIBLINGS (alexandria-tests)
    PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''array-utils'';
-  version = ''20170630-git'';
+  version = ''20180131-git'';

  description = ''A few utilities for working with arrays.'';

  deps = [ ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz'';
-    sha256 = ''1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb'';
+    url = ''http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz'';
+    sha256 = ''01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0'';
  };

  packageName = "array-utils";
@ -18,8 +18,8 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays.
-    SHA256 1nj42w2q11qdg65cviaj514pcql1gi729mcsj5g2vy17pr298zgb URL
-    http://beta.quicklisp.org/archive/array-utils/2017-06-30/array-utils-20170630-git.tgz
-    MD5 550b37bc0eccfafa889de00b59c422dc NAME array-utils FILENAME array-utils
-    DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (array-utils-test)
+    SHA256 01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0 URL
+    http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz
+    MD5 339670a03dd7d865cd045a6556d705c6 NAME array-utils FILENAME array-utils
+    DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS (array-utils-test)
    PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''babel-streams'';
-  version = ''babel-20170630-git'';
+  version = ''babel-20171227-git'';

  description = ''Some useful streams based on Babel's encoding code'';

  deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz'';
-    sha256 = ''0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx'';
+    url = ''http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz'';
+    sha256 = ''166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf'';
  };

  packageName = "babel-streams";
@ -19,12 +19,12 @@ rec {
 }
 /* (SYSTEM babel-streams DESCRIPTION
    Some useful streams based on Babel's encoding code SHA256
-    0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL
-    http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz
-    MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel-streams FILENAME
+    166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf URL
+    http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz
+    MD5 8ea39f73873847907a8bb67f99f16ecd NAME babel-streams FILENAME
    babel-streams DEPS
    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
     (NAME trivial-features FILENAME trivial-features)
     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
    DEPENDENCIES (alexandria babel trivial-features trivial-gray-streams)
-    VERSION babel-20170630-git SIBLINGS (babel-tests babel) PARASITES NIL) */
+    VERSION babel-20171227-git SIBLINGS (babel-tests babel) PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''babel'';
-  version = ''20170630-git'';
+  version = ''20171227-git'';

  description = ''Babel, a charset conversion library.'';

  deps = [ args."alexandria" args."trivial-features" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz'';
-    sha256 = ''0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx'';
+    url = ''http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz'';
+    sha256 = ''166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf'';
  };

  packageName = "babel";
@ -18,10 +18,10 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256
-    0w1jfzdklk5zz9vgplr2a0vc6gybrwl8wa72nj6xs4ihp7spf0lx URL
-    http://beta.quicklisp.org/archive/babel/2017-06-30/babel-20170630-git.tgz
-    MD5 aa7eff848b97bb7f7aa6bdb43a081964 NAME babel FILENAME babel DEPS
+    166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf URL
+    http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz
+    MD5 8ea39f73873847907a8bb67f99f16ecd NAME babel FILENAME babel DEPS
    ((NAME alexandria FILENAME alexandria)
     (NAME trivial-features FILENAME trivial-features))
-    DEPENDENCIES (alexandria trivial-features) VERSION 20170630-git SIBLINGS
+    DEPENDENCIES (alexandria trivial-features) VERSION 20171227-git SIBLINGS
    (babel-streams babel-tests) PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''caveman'';
-  version = ''20170630-git'';
+  version = ''20171019-git'';

  description = ''Web Application Framework for Common Lisp'';

-  deps = [ args."anaphora" args."cl-emb" args."cl-ppcre" args."cl-project" args."cl-syntax" args."cl-syntax-annot" args."clack-v1-compat" args."do-urlencode" args."local-time" args."myway" ];
+  deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."circular-streams" args."cl-annot" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack-v1-compat" args."dexador" args."do-urlencode" args."http-body" args."lack" args."let-plus" args."local-time" args."map-set" args."marshal" args."myway" args."named-readtables" args."prove" args."quri" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."usocket" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz'';
-    sha256 = ''0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2'';
+    url = ''http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz'';
+    sha256 = ''0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra'';
  };

  packageName = "caveman";
@ -18,20 +18,42 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256
-    0wpjnskcvrgvqn9gbr43yqnpcxfmdggbiyaxz9rrhgcis2rwjkj2 URL
-    http://beta.quicklisp.org/archive/caveman/2017-06-30/caveman-20170630-git.tgz
-    MD5 774f85fa78792bde012bad78efff4b53 NAME caveman FILENAME caveman DEPS
-    ((NAME anaphora FILENAME anaphora) (NAME cl-emb FILENAME cl-emb)
-     (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-project FILENAME cl-project)
-     (NAME cl-syntax FILENAME cl-syntax)
+    0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra URL
+    http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz
+    MD5 41318d26a0825e504042fa693959feaf NAME caveman FILENAME caveman DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
+     (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME circular-streams FILENAME circular-streams)
+     (NAME cl-annot FILENAME cl-annot)
+     (NAME cl-ansi-text FILENAME cl-ansi-text)
+     (NAME cl-colors FILENAME cl-colors) (NAME cl-emb FILENAME cl-emb)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-project FILENAME cl-project) (NAME cl-syntax FILENAME cl-syntax)
     (NAME cl-syntax-annot FILENAME cl-syntax-annot)
+     (NAME cl-utilities FILENAME cl-utilities)
     (NAME clack-v1-compat FILENAME clack-v1-compat)
-     (NAME do-urlencode FILENAME do-urlencode)
-     (NAME local-time FILENAME local-time) (NAME myway FILENAME myway))
+     (NAME dexador FILENAME dexador) (NAME do-urlencode FILENAME do-urlencode)
+     (NAME http-body FILENAME http-body) (NAME lack FILENAME lack)
+     (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time)
+     (NAME map-set FILENAME map-set) (NAME marshal FILENAME marshal)
+     (NAME myway FILENAME myway)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME prove FILENAME prove) (NAME quri FILENAME quri)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME trivial-backtrace FILENAME trivial-backtrace)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME trivial-types FILENAME trivial-types)
+     (NAME usocket FILENAME usocket))
    DEPENDENCIES
-    (anaphora cl-emb cl-ppcre cl-project cl-syntax cl-syntax-annot
-     clack-v1-compat do-urlencode local-time myway)
-    VERSION 20170630-git SIBLINGS
+    (alexandria anaphora babel babel-streams bordeaux-threads circular-streams
+     cl-annot cl-ansi-text cl-colors cl-emb cl-fad cl-ppcre cl-project
+     cl-syntax cl-syntax-annot cl-utilities clack-v1-compat dexador
+     do-urlencode http-body lack let-plus local-time map-set marshal myway
+     named-readtables prove quri split-sequence trivial-backtrace
+     trivial-features trivial-gray-streams trivial-types usocket)
+    VERSION 20171019-git SIBLINGS
    (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test
     caveman2)
    PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''chunga'';
-  version = ''1.1.6'';
+  version = ''20180131-git'';

  description = '''';

  deps = [ args."trivial-gray-streams" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz'';
-    sha256 = ''1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg'';
+    url = ''http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz'';
+    sha256 = ''0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq'';
  };

  packageName = "chunga";
@ -18,8 +18,8 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM chunga DESCRIPTION NIL SHA256
-    1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg URL
-    http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz MD5
-    75f5c4f9dec3a8a181ed5ef7e5d700b5 NAME chunga FILENAME chunga DEPS
+    0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq URL
+    http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz
+    MD5 044b684535b11b1eee1cf939bec6e14a NAME chunga FILENAME chunga DEPS
    ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES
-    (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL PARASITES NIL) */
+    (trivial-gray-streams) VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@ -5,7 +5,7 @@ rec {

  description = ''Circularly readable streams for Common Lisp'';

-  deps = [ args."alexandria" args."fast-io" args."static-vectors" args."trivial-gray-streams" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ];

  src = fetchurl {
    url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz'';
@ -23,8 +23,13 @@ rec {
    http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz
    MD5 2383f3b82fa3335d9106e1354a678db8 NAME circular-streams FILENAME
    circular-streams DEPS
-    ((NAME alexandria FILENAME alexandria) (NAME fast-io FILENAME fast-io)
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME fast-io FILENAME fast-io)
     (NAME static-vectors FILENAME static-vectors)
+     (NAME trivial-features FILENAME trivial-features)
     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
-    DEPENDENCIES (alexandria fast-io static-vectors trivial-gray-streams)
+    DEPENDENCIES
+    (alexandria babel cffi cffi-grovel fast-io static-vectors trivial-features
+     trivial-gray-streams)
    VERSION 20161204-git SIBLINGS (circular-streams-test) PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl+ssl'';
-  version = ''cl+ssl-20170725-git'';
+  version = ''cl+ssl-20171227-git'';

  parasites = [ "openssl-1.1.0" ];

@ -10,8 +10,8 @@ rec {
  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz'';
-    sha256 = ''1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69'';
+    url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz'';
+    sha256 = ''1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4'';
  };

  packageName = "cl+ssl";
@ -20,9 +20,9 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256
-    1p5886l5bwz4bj2xy8mpsjswg103b8saqdnw050a4wk9shpj1j69 URL
-    http://beta.quicklisp.org/archive/cl+ssl/2017-07-25/cl+ssl-20170725-git.tgz
-    MD5 3458c83f442395e0492c7e9b9720a1f2 NAME cl+ssl FILENAME cl+ssl DEPS
+    1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4 URL
+    http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz
+    MD5 d00ce843db6038e6ff33d19668b5e038 NAME cl+ssl FILENAME cl+ssl DEPS
    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
     (NAME bordeaux-threads FILENAME bordeaux-threads)
     (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams)
@ -33,5 +33,5 @@ rec {
    DEPENDENCIES
    (alexandria babel bordeaux-threads cffi flexi-streams trivial-features
     trivial-garbage trivial-gray-streams uiop)
-    VERSION cl+ssl-20170725-git SIBLINGS (cl+ssl.test) PARASITES
+    VERSION cl+ssl-20171227-git SIBLINGS (cl+ssl.test) PARASITES
    (openssl-1.1.0)) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-async-repl'';
-  version = ''cl-async-20160825-git'';
+  version = ''cl-async-20171130-git'';

  description = ''REPL integration for CL-ASYNC.'';

  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
-    sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
+    sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm'';
  };

  packageName = "cl-async-repl";
@ -18,9 +18,9 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256
-    104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
-    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz
-    MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-repl FILENAME
+    0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL
+    http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz
+    MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-repl FILENAME
    cl-async-repl DEPS
    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
     (NAME bordeaux-threads FILENAME bordeaux-threads)
@ -38,5 +38,5 @@ rec {
    (alexandria babel bordeaux-threads cffi cffi-grovel cl-async cl-async-base
     cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features
     trivial-gray-streams vom)
-    VERSION cl-async-20160825-git SIBLINGS
+    VERSION cl-async-20171130-git SIBLINGS
    (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-async-ssl'';
-  version = ''cl-async-20160825-git'';
+  version = ''cl-async-20171130-git'';

  description = ''SSL Wrapper around cl-async socket implementation.'';

  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
-    sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
+    sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm'';
  };

  packageName = "cl-async-ssl";
@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM cl-async-ssl DESCRIPTION
    SSL Wrapper around cl-async socket implementation. SHA256
-    104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
-    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz
-    MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-ssl FILENAME
+    0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL
+    http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz
+    MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-ssl FILENAME
    cl-async-ssl DEPS
    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
     (NAME bordeaux-threads FILENAME bordeaux-threads)
@ -39,5 +39,5 @@ rec {
    (alexandria babel bordeaux-threads cffi cffi-grovel cl-async cl-async-base
     cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features
     trivial-gray-streams vom)
-    VERSION cl-async-20160825-git SIBLINGS
+    VERSION cl-async-20171130-git SIBLINGS
    (cl-async-repl cl-async-test cl-async) PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-async'';
-  version = ''20160825-git'';
+  version = ''20171130-git'';

  parasites = [ "cl-async-base" "cl-async-util" ];

@ -10,8 +10,8 @@ rec {
  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
-    sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
+    sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm'';
  };

  packageName = "cl-async";
@ -20,9 +20,9 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256
-    104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
-    http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz
-    MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async FILENAME cl-async DEPS
+    0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL
+    http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz
+    MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async FILENAME cl-async DEPS
    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
     (NAME bordeaux-threads FILENAME bordeaux-threads)
     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@ -35,5 +35,5 @@ rec {
    DEPENDENCIES
    (alexandria babel bordeaux-threads cffi cffi-grovel cl-libuv cl-ppcre
     fast-io static-vectors trivial-features trivial-gray-streams uiop vom)
-    VERSION 20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
+    VERSION 20171130-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
    PARASITES (cl-async-base cl-async-util)) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-csv'';
-  version = ''20170403-git'';
+  version = ''20180131-git'';

-  parasites = [ "cl-csv-test" ];
+  parasites = [ "cl-csv/test" ];

  description = ''Facilities for reading and writing CSV format files'';

  deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz'';
-    sha256 = ''1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h'';
+    url = ''http://beta.quicklisp.org/archive/cl-csv/2018-01-31/cl-csv-20180131-git.tgz'';
+    sha256 = ''0i912ch1mvms5iynmxrlxclzc325n3zsn3y9qdszh5lhpmw043wh'';
  };

  packageName = "cl-csv";
@ -21,9 +21,9 @@ rec {
 }
 /* (SYSTEM cl-csv DESCRIPTION
    Facilities for reading and writing CSV format files SHA256
-    1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h URL
-    http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz
-    MD5 1e71a90c5057371fab044d440c39f0a3 NAME cl-csv FILENAME cl-csv DEPS
+    0i912ch1mvms5iynmxrlxclzc325n3zsn3y9qdszh5lhpmw043wh URL
+    http://beta.quicklisp.org/archive/cl-csv/2018-01-31/cl-csv-20180131-git.tgz
+    MD5 0be8956ee31e03436f8a2190387bad46 NAME cl-csv FILENAME cl-csv DEPS
    ((NAME alexandria FILENAME alexandria)
     (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre)
     (NAME cl-unicode FILENAME cl-unicode)
@ -32,5 +32,5 @@ rec {
    DEPENDENCIES
    (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate
     lisp-unit2)
-    VERSION 20170403-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES
-    (cl-csv-test)) */
+    VERSION 20180131-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES
+    (cl-csv/test)) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-dbi'';
-  version = ''20170725-git'';
+  version = ''20180131-git'';

  description = '''';

  deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz'';
-    sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz'';
+    sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn'';
  };

  packageName = "cl-dbi";
@ -18,9 +18,9 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM cl-dbi DESCRIPTION NIL SHA256
-    1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
-    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz
-    MD5 a9fe67b7fea2640cea9708342a1347bd NAME cl-dbi FILENAME cl-dbi DEPS
+    0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL
+    http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz
+    MD5 7dacf1c276fab38b952813795ff1f707 NAME cl-dbi FILENAME cl-dbi DEPS
    ((NAME alexandria FILENAME alexandria)
     (NAME bordeaux-threads FILENAME bordeaux-threads)
     (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@ -32,5 +32,5 @@ rec {
    DEPENDENCIES
    (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
     dbi named-readtables split-sequence trivial-types)
-    VERSION 20170725-git SIBLINGS
+    VERSION 20180131-git SIBLINGS
    (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-fad'';
-  version = ''0.7.4'';
+  version = ''20171227-git'';

  parasites = [ "cl-fad-test" ];

@ -10,8 +10,8 @@ rec {
  deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz'';
-    sha256 = ''1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x'';
+    url = ''http://beta.quicklisp.org/archive/cl-fad/2017-12-27/cl-fad-20171227-git.tgz'';
+    sha256 = ''0dl2c1klv55vk99j1b31f2s1rd1m9c94l1n0aly8spwxz3yd3za8'';
  };

  packageName = "cl-fad";
@ -20,11 +20,11 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256
-    1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x URL
-    http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz MD5
-    8ee53f2249eca9d7d54e268662b41845 NAME cl-fad FILENAME cl-fad DEPS
+    0dl2c1klv55vk99j1b31f2s1rd1m9c94l1n0aly8spwxz3yd3za8 URL
+    http://beta.quicklisp.org/archive/cl-fad/2017-12-27/cl-fad-20171227-git.tgz
+    MD5 f6b34f61ebba1c68e8fe122bb7de3f77 NAME cl-fad FILENAME cl-fad DEPS
    ((NAME alexandria FILENAME alexandria)
     (NAME bordeaux-threads FILENAME bordeaux-threads)
     (NAME cl-ppcre FILENAME cl-ppcre) (NAME unit-test FILENAME unit-test))
-    DEPENDENCIES (alexandria bordeaux-threads cl-ppcre unit-test) VERSION 0.7.4
-    SIBLINGS NIL PARASITES (cl-fad-test)) */
+    DEPENDENCIES (alexandria bordeaux-threads cl-ppcre unit-test) VERSION
+    20171227-git SIBLINGS NIL PARASITES (cl-fad-test)) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-html-parse'';
+  version = ''20161031-git'';
+
+  description = ''HTML Parser'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-html-parse/2016-10-31/cl-html-parse-20161031-git.tgz'';
+    sha256 = ''0i0nl630p9l6rqylydhfqrlqhl5sfq94a9wglx0dajk8gkkqjbnb'';
+  };
+
+  packageName = "cl-html-parse";
+
+  asdFilesToKeep = ["cl-html-parse.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cl-html-parse DESCRIPTION HTML Parser SHA256
+    0i0nl630p9l6rqylydhfqrlqhl5sfq94a9wglx0dajk8gkkqjbnb URL
+    http://beta.quicklisp.org/archive/cl-html-parse/2016-10-31/cl-html-parse-20161031-git.tgz
+    MD5 7fe933c461eaf2dd442da189d6827a72 NAME cl-html-parse FILENAME
+    cl-html-parse DEPS NIL DEPENDENCIES NIL VERSION 20161031-git SIBLINGS NIL
+    PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-interpol'';
-  version = ''0.2.6'';
+  version = ''20171227-git'';

  parasites = [ "cl-interpol-test" ];

@ -10,8 +10,8 @@ rec {
  deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz'';
-    sha256 = ''172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b'';
+    url = ''http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz'';
+    sha256 = ''1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy'';
  };

  packageName = "cl-interpol";
@ -20,11 +20,11 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM cl-interpol DESCRIPTION NIL SHA256
-    172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b URL
-    http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz
-    MD5 1adc92924670601ebb92546ef8bdc6a7 NAME cl-interpol FILENAME cl-interpol
+    1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy URL
+    http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz
+    MD5 e9d2f0238bb8f7a0c5b1ef1e6ef390ae NAME cl-interpol FILENAME cl-interpol
    DEPS
    ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode)
     (NAME flexi-streams FILENAME flexi-streams))
-    DEPENDENCIES (cl-ppcre cl-unicode flexi-streams) VERSION 0.2.6 SIBLINGS NIL
-    PARASITES (cl-interpol-test)) */
+    DEPENDENCIES (cl-ppcre cl-unicode flexi-streams) VERSION 20171227-git
+    SIBLINGS NIL PARASITES (cl-interpol-test)) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-mysql'';
-  version = ''20160628-git'';
+  version = ''20171019-git'';

  description = ''Common Lisp MySQL library bindings'';

  deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz'';
-    sha256 = ''1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319'';
+    url = ''http://beta.quicklisp.org/archive/cl-mysql/2017-10-19/cl-mysql-20171019-git.tgz'';
+    sha256 = ''1ga44gkwg6lm225gqpacpqpr6bpswszmw1ba9jhvjpjm09zinyc5'';
  };

  packageName = "cl-mysql";
@ -18,11 +18,11 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM cl-mysql DESCRIPTION Common Lisp MySQL library bindings SHA256
-    1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319 URL
-    http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz
-    MD5 349615d041c2f2177b678088f9c22409 NAME cl-mysql FILENAME cl-mysql DEPS
+    1ga44gkwg6lm225gqpacpqpr6bpswszmw1ba9jhvjpjm09zinyc5 URL
+    http://beta.quicklisp.org/archive/cl-mysql/2017-10-19/cl-mysql-20171019-git.tgz
+    MD5 e1021da4d35cbb584d4df4f0d7e2bbb9 NAME cl-mysql FILENAME cl-mysql DEPS
    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
     (NAME cffi FILENAME cffi)
     (NAME trivial-features FILENAME trivial-features))
-    DEPENDENCIES (alexandria babel cffi trivial-features) VERSION 20160628-git
+    DEPENDENCIES (alexandria babel cffi trivial-features) VERSION 20171019-git
    SIBLINGS (cl-mysql-test) PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-postgres'';
-  version = ''postmodern-20170403-git'';
+  version = ''postmodern-20180131-git'';

-  parasites = [ "cl-postgres-tests" ];
+  parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ];

  description = ''Low-level client library for PostgreSQL'';

-  deps = [ args."fiveam" args."md5" ];
+  deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
-    sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
+    url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz'';
+    sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki'';
  };

  packageName = "cl-postgres";
@ -20,9 +20,14 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL
-    SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
-    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz
-    MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME cl-postgres FILENAME cl-postgres
-    DEPS ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5)) DEPENDENCIES
-    (fiveam md5) VERSION postmodern-20170403-git SIBLINGS
-    (postmodern s-sql simple-date) PARASITES (cl-postgres-tests)) */
+    SHA256 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL
+    http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz
+    MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME cl-postgres FILENAME cl-postgres
+    DEPS
+    ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5)
+     (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME usocket FILENAME usocket))
+    DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket)
+    VERSION postmodern-20180131-git SIBLINGS (postmodern s-sql simple-date)
+    PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-ppcre-template'';
-  version = ''cl-unification-20170630-git'';
+  version = ''cl-unification-20171227-git'';

  description = ''A system used to conditionally load the CL-PPCRE Template.

@ -12,8 +12,8 @@ REGULAR-EXPRESSION-TEMPLATE.'';
  deps = [ args."cl-ppcre" args."cl-unification" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz'';
-    sha256 = ''063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz'';
+    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz'';
+    sha256 = ''0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p'';
  };

  packageName = "cl-ppcre-template";
@ -27,12 +27,12 @@ REGULAR-EXPRESSION-TEMPLATE.'';
 This system is not required and it is handled only if CL-PPCRE is
 available.  If it is, then the library provides the
 REGULAR-EXPRESSION-TEMPLATE.
-    SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL
-    http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz
-    MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-ppcre-template FILENAME
+    SHA256 0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p URL
+    http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz
+    MD5 45bfd18f8e15d16222e0f747992a6ce6 NAME cl-ppcre-template FILENAME
    cl-ppcre-template DEPS
    ((NAME cl-ppcre FILENAME cl-ppcre)
     (NAME cl-unification FILENAME cl-unification))
-    DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20170630-git
+    DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20171227-git
    SIBLINGS (cl-unification-lib cl-unification-test cl-unification) PARASITES
    NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-ppcre-unicode'';
-  version = ''cl-ppcre-2.0.11'';
+  version = ''cl-ppcre-20171227-git'';

  parasites = [ "cl-ppcre-unicode-test" ];

@ -10,8 +10,8 @@ rec {
  deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz'';
-    sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2'';
+    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz'';
+    sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4'';
  };

  packageName = "cl-ppcre-unicode";
@ -21,13 +21,13 @@ rec {
 }
 /* (SYSTEM cl-ppcre-unicode DESCRIPTION
    Perl-compatible regular expression library (Unicode) SHA256
-    1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL
-    http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz
-    MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre-unicode FILENAME
+    0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL
+    http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz
+    MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre-unicode FILENAME
    cl-ppcre-unicode DEPS
    ((NAME cl-ppcre FILENAME cl-ppcre)
     (NAME cl-ppcre-test FILENAME cl-ppcre-test)
     (NAME cl-unicode FILENAME cl-unicode)
     (NAME flexi-streams FILENAME flexi-streams))
    DEPENDENCIES (cl-ppcre cl-ppcre-test cl-unicode flexi-streams) VERSION
-    cl-ppcre-2.0.11 SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */
+    cl-ppcre-20171227-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-ppcre'';
-  version = ''2.0.11'';
+  version = ''20171227-git'';

  parasites = [ "cl-ppcre-test" ];

@ -10,8 +10,8 @@ rec {
  deps = [ args."flexi-streams" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz'';
-    sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2'';
+    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz'';
+    sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4'';
  };

  packageName = "cl-ppcre";
@ -20,8 +20,8 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library
-    SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL
-    http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz
-    MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre FILENAME cl-ppcre DEPS
+    SHA256 0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL
+    http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz
+    MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre FILENAME cl-ppcre DEPS
    ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams)
-    VERSION 2.0.11 SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */
+    VERSION 20171227-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-project'';
-  version = ''20160531-git'';
+  version = ''20171019-git'';

  description = ''Generate a skeleton for modern project'';

  deps = [ args."alexandria" args."anaphora" args."bordeaux-threads" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz'';
-    sha256 = ''1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81'';
+    url = ''http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz'';
+    sha256 = ''1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q'';
  };

  packageName = "cl-project";
@ -18,9 +18,9 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256
-    1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81 URL
-    http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz
-    MD5 63de5ce6f0f3e5f60094a86d32c2f1a9 NAME cl-project FILENAME cl-project
+    1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q URL
+    http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz
+    MD5 9dbfd7f9b0a83ca608031ebf32185a0f NAME cl-project FILENAME cl-project
    DEPS
    ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
     (NAME bordeaux-threads FILENAME bordeaux-threads)
@ -32,4 +32,4 @@ rec {
    DEPENDENCIES
    (alexandria anaphora bordeaux-threads cl-ansi-text cl-colors cl-emb cl-fad
     cl-ppcre let-plus local-time prove uiop)
-    VERSION 20160531-git SIBLINGS (cl-project-test) PARASITES NIL) */
+    VERSION 20171019-git SIBLINGS (cl-project-test) PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-smtp'';
-  version = ''20160825-git'';
+  version = ''20180131-git'';

  description = ''Common Lisp smtp client.'';

  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl+ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz'';
-    sha256 = ''0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh'';
+    url = ''http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz'';
+    sha256 = ''0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61'';
  };

  packageName = "cl-smtp";
@ -18,9 +18,9 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256
-    0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh URL
-    http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz
-    MD5 e6bb60e66b0f7d9cc5e4f98aba56998a NAME cl-smtp FILENAME cl-smtp DEPS
+    0sjjynnynxmfxdfpvzl3jj1jz0dhj0bx4bv63q1icm2p9xzfzb61 URL
+    http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz
+    MD5 0ce08f067f145ab4c7528f806f0b51ff NAME cl-smtp FILENAME cl-smtp DEPS
    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
     (NAME bordeaux-threads FILENAME bordeaux-threads)
     (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl+ssl)
@ -35,4 +35,4 @@ rec {
    (alexandria babel bordeaux-threads cffi cl+ssl cl-base64 flexi-streams
     split-sequence trivial-features trivial-garbage trivial-gray-streams
     usocket)
-    VERSION 20160825-git SIBLINGS NIL PARASITES NIL) */
+    VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-test-more'';
-  version = ''prove-20170403-git'';
+  version = ''prove-20171130-git'';

  description = '''';

  deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."prove" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz'';
-    sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl'';
+    url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz'';
+    sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar'';
  };

  packageName = "cl-test-more";
@ -18,9 +18,9 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM cl-test-more DESCRIPTION NIL SHA256
-    091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL
-    http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz
-    MD5 063b615692c8711d2392204ecf1b37b7 NAME cl-test-more FILENAME
+    13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL
+    http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz
+    MD5 630df4367537f799570be40242f8ed52 NAME cl-test-more FILENAME
    cl-test-more DEPS
    ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
     (NAME cl-ansi-text FILENAME cl-ansi-text)
@ -28,5 +28,5 @@ rec {
     (NAME let-plus FILENAME let-plus) (NAME prove FILENAME prove))
    DEPENDENCIES
    (alexandria anaphora cl-ansi-text cl-colors cl-ppcre let-plus prove)
-    VERSION prove-20170403-git SIBLINGS (prove-asdf prove-test prove) PARASITES
+    VERSION prove-20171130-git SIBLINGS (prove-asdf prove-test prove) PARASITES
    NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-unicode'';
-  version = ''0.1.5'';
+  version = ''20180131-git'';

  parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ];

@ -10,8 +10,8 @@ rec {
  deps = [ args."cl-ppcre" args."flexi-streams" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz'';
-    sha256 = ''1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n'';
+    url = ''http://beta.quicklisp.org/archive/cl-unicode/2018-01-31/cl-unicode-20180131-git.tgz'';
+    sha256 = ''113hsx22pw4ydwzkyr9y7l8a8jq3nkhwazs03wj3mh2dczwv28xa'';
  };

  packageName = "cl-unicode";
@ -20,11 +20,11 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256
-    1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n URL
-    http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz
-    MD5 2fd456537bd670126da84466226bc5c5 NAME cl-unicode FILENAME cl-unicode
+    113hsx22pw4ydwzkyr9y7l8a8jq3nkhwazs03wj3mh2dczwv28xa URL
+    http://beta.quicklisp.org/archive/cl-unicode/2018-01-31/cl-unicode-20180131-git.tgz
+    MD5 653ba12d595599b32aa2a8c7c8b65c28 NAME cl-unicode FILENAME cl-unicode
    DEPS
    ((NAME cl-ppcre FILENAME cl-ppcre)
     (NAME flexi-streams FILENAME flexi-streams))
-    DEPENDENCIES (cl-ppcre flexi-streams) VERSION 0.1.5 SIBLINGS NIL PARASITES
-    (cl-unicode/base cl-unicode/build cl-unicode/test)) */
+    DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20180131-git SIBLINGS NIL
+    PARASITES (cl-unicode/base cl-unicode/build cl-unicode/test)) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-unification'';
-  version = ''20170630-git'';
+  version = ''20171227-git'';

  description = ''The CL-UNIFICATION system.

@ -10,8 +10,8 @@ The system contains the definitions for the 'unification' machinery.'';
  deps = [ ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz'';
-    sha256 = ''063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz'';
+    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz'';
+    sha256 = ''0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p'';
  };

  packageName = "cl-unification";
@ -22,8 +22,8 @@ The system contains the definitions for the 'unification' machinery.'';
 /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system.

 The system contains the definitions for the 'unification' machinery.
-    SHA256 063xcf2ib3gdpjr39bgkaj6msylzdhbdjsj458w08iyidbxivwlz URL
-    http://beta.quicklisp.org/archive/cl-unification/2017-06-30/cl-unification-20170630-git.tgz
-    MD5 f6bf197ca8c79c935efe3a3c25953044 NAME cl-unification FILENAME
-    cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170630-git SIBLINGS
+    SHA256 0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p URL
+    http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz
+    MD5 45bfd18f8e15d16222e0f747992a6ce6 NAME cl-unification FILENAME
+    cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20171227-git SIBLINGS
    (cl-unification-lib cl-unification-test cl-ppcre-template) PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''cl-who'';
-  version = ''1.1.4'';
+  version = ''20171130-git'';

  parasites = [ "cl-who-test" ];

@ -10,8 +10,8 @@ rec {
  deps = [ args."flexi-streams" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz'';
-    sha256 = ''0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq'';
+    url = ''http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz'';
+    sha256 = ''1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw'';
  };

  packageName = "cl-who";
@ -20,8 +20,8 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM cl-who DESCRIPTION (X)HTML generation macros SHA256
-    0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq URL
-    http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz MD5
-    a9e6f0b6a8aaa247dbf751de2cb550bf NAME cl-who FILENAME cl-who DEPS
+    1941kwnvqnqr81vjkv8fcpc16abz7hrrmz18xwxxprsi6wifzjzw URL
+    http://beta.quicklisp.org/archive/cl-who/2017-11-30/cl-who-20171130-git.tgz
+    MD5 257a670166ff9d24d1570f44be0c7171 NAME cl-who FILENAME cl-who DEPS
    ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams)
-    VERSION 1.1.4 SIBLINGS NIL PARASITES (cl-who-test)) */
+    VERSION 20171130-git SIBLINGS NIL PARASITES (cl-who-test)) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''closer-mop'';
-  version = ''20170725-git'';
+  version = ''20180131-git'';

  description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';

  deps = [ ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closer-mop/2017-07-25/closer-mop-20170725-git.tgz'';
-    sha256 = ''0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc'';
+    url = ''http://beta.quicklisp.org/archive/closer-mop/2018-01-31/closer-mop-20180131-git.tgz'';
+    sha256 = ''0lsfpxppbd8j4ayfrhd723ck367yb4amdywwaqj9yivh00zn4r6s'';
  };

  packageName = "closer-mop";
@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM closer-mop DESCRIPTION
    Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
-    SHA256 0qc4zh4zicv3zm4bw8c3s2r2bjbx2bp31j69lwiz1mdl9xg0nhsc URL
-    http://beta.quicklisp.org/archive/closer-mop/2017-07-25/closer-mop-20170725-git.tgz
-    MD5 308f9e8e4ea4573c7b6820055b6f171d NAME closer-mop FILENAME closer-mop
-    DEPS NIL DEPENDENCIES NIL VERSION 20170725-git SIBLINGS NIL PARASITES NIL) */
+    SHA256 0lsfpxppbd8j4ayfrhd723ck367yb4amdywwaqj9yivh00zn4r6s URL
+    http://beta.quicklisp.org/archive/closer-mop/2018-01-31/closer-mop-20180131-git.tgz
+    MD5 d572109e102869d89f206a46619c2ed0 NAME closer-mop FILENAME closer-mop
+    DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
@ -0,0 +1,33 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''closure-html'';
+  version = ''20140826-git'';
+
+  description = '''';
+
+  deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz'';
+    sha256 = ''1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb'';
+  };
+
+  packageName = "closure-html";
+
+  asdFilesToKeep = ["closure-html.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM closure-html DESCRIPTION NIL SHA256
+    1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb URL
+    http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz
+    MD5 3f8d8a4fd54f915ca6cc5fdf29239d98 NAME closure-html FILENAME
+    closure-html DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME closure-common FILENAME closure-common)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+    DEPENDENCIES
+    (alexandria babel closure-common flexi-streams trivial-features
+     trivial-gray-streams)
+    VERSION 20140826-git SIBLINGS NIL PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''clss'';
-  version = ''20170630-git'';
+  version = ''20180131-git'';

  description = ''A DOM tree searching engine based on CSS selectors.'';

-  deps = [ args."array-utils" args."plump" ];
+  deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz'';
-    sha256 = ''0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0'';
+    url = ''http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz'';
+    sha256 = ''0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r'';
  };

  packageName = "clss";
@ -18,9 +18,11 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors.
-    SHA256 0kdkzx7z997lzbf331p4fkqhri0ind7agknl9y992x917m9y4rn0 URL
-    http://beta.quicklisp.org/archive/clss/2017-06-30/clss-20170630-git.tgz MD5
-    61bbadf22391940813bfc66dfd59d304 NAME clss FILENAME clss DEPS
-    ((NAME array-utils FILENAME array-utils) (NAME plump FILENAME plump))
-    DEPENDENCIES (array-utils plump) VERSION 20170630-git SIBLINGS NIL
-    PARASITES NIL) */
+    SHA256 0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r URL
+    http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz MD5
+    138244b7871d8ea832832aa9cc5867e6 NAME clss FILENAME clss DEPS
+    ((NAME array-utils FILENAME array-utils)
+     (NAME documentation-utils FILENAME documentation-utils)
+     (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent))
+    DEPENDENCIES (array-utils documentation-utils plump trivial-indent) VERSION
+    20180131-git SIBLINGS NIL PARASITES NIL) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@ -1,15 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''clx'';
-  version = ''20170630-git'';
+  version = ''20171227-git'';
+
+  parasites = [ "clx/test" ];

  description = ''An implementation of the X Window System protocol in Lisp.'';

-  deps = [ ];
+  deps = [ args."fiasco" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz'';
-    sha256 = ''0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7'';
+    url = ''http://beta.quicklisp.org/archive/clx/2017-12-27/clx-20171227-git.tgz'';
+    sha256 = ''159kwwilyvaffjdz7sbwwd4cncfa8kxndc7n3adml9ivbvaz2wri'';
  };

  packageName = "clx";
@ -19,7 +21,8 @@ rec {
 }
 /* (SYSTEM clx DESCRIPTION
    An implementation of the X Window System protocol in Lisp. SHA256
-    0di8h3galjylgmy30qqwa4q8mb5505rcag0y4ia7mv7sls51jbp7 URL
-    http://beta.quicklisp.org/archive/clx/2017-06-30/clx-20170630-git.tgz MD5
-    ccfec3f35979df3bead0b73adc1d798a NAME clx FILENAME clx DEPS NIL
-    DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */
+    159kwwilyvaffjdz7sbwwd4cncfa8kxndc7n3adml9ivbvaz2wri URL
+    http://beta.quicklisp.org/archive/clx/2017-12-27/clx-20171227-git.tgz MD5
+    40642f49e26b88859376efe2e5330a24 NAME clx FILENAME clx DEPS
+    ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20171227-git
+    SIBLINGS NIL PARASITES (clx/test)) */
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
  baseName = ''dbd-mysql'';
-  version = ''cl-dbi-20170725-git'';
+  version = ''cl-dbi-20180131-git'';

  description = ''Database driver for MySQL.'';

  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ];

  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz'';
-    sha256 = ''1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz'';
+    sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn'';
  };

  packageName = "dbd-mysql";
@ -18,9 +18,9 @@ rec {
  overrides = x: x;
 }
 /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256
-    1gmd5y44nidqmxw7zk0mxl4mgl3mcjf1v05gjdslp3ginzznrqzl URL
-    http://beta.quicklisp.org/archive/cl-dbi/2017-07-25/cl-dbi-20170725-git.tgz
-    MD5 a9fe67b7fea2640cea9708342a1347bd NAME dbd-mysql FILENAME dbd-mysql DEPS
+    0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL
+    http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz
+    MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-mysql FILENAME dbd-mysql DEPS
    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
     (NAME bordeaux-threads FILENAME bordeaux-threads)
     (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot)
@ -35,5 +35,5 @@ rec {
    (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax
     cl-syntax-annot closer-mop dbi named-readtables split-sequence
     trivial-features trivial-types)
-    VERSION cl-dbi-20170725-git SIBLINGS
+    VERSION cl-dbi-20180131-git SIBLINGS
    (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
--- a/Show More
+++ b/Show More