Merge staging-next into staging

95 files changed, 958 insertions, 861 deletions

diff --git a/README.md b/README.md
index 278ef66cf7e8c..29c023e4dcdff 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ release and `nixos-unstable` for the latest successful build of master:
 % git rebase channels/nixos-18.09
 ```
 
-For pull-requests, please rebase onto nixpkgs `master`.
+For pull requests, please rebase onto nixpkgs `master`.
 
 [NixOS](https://nixos.org/nixos/) Linux distribution source code is located inside
 `nixos/` folder.
diff --git a/doc/configuration.xml b/doc/configuration.xml
index af74f3f9c01fb..624a5bb270abb 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -132,7 +132,7 @@
   </itemizedlist>
 
   <para>
-   The difference between an a package being unsupported on some system and
+   The difference between a package being unsupported on some system and
    being broken is admittedly a bit fuzzy. If a program
    <emphasis>ought</emphasis> to work on a certain platform, but doesn't, the
    platform should be included in <literal>meta.platforms</literal>, but marked
@@ -175,11 +175,12 @@
 </programlisting>
     </para>
     <para>
-     A more useful example, the following configuration allows only allows
-     flash player and visual studio code:
+     For a more useful example, try the following. This configuration
+     only allows unfree packages named flash player and visual studio
+     code:
 <programlisting>
 {
-  allowUnfreePredicate = (pkg: elem (builtins.parseDrvName pkg.name).name [ "flashplayer" "vscode" ]);
+  allowUnfreePredicate = (pkg: builtins.elem (builtins.parseDrvName pkg.name).name [ "flashplayer" "vscode" ]);
 }
 </programlisting>
     </para>
@@ -286,8 +287,8 @@
 
   <para>
    You can define a function called <varname>packageOverrides</varname> in your
-   local <filename>~/.config/nixpkgs/config.nix</filename> to override nix
-   packages. It must be a function that takes pkgs as an argument and return
+   local <filename>~/.config/nixpkgs/config.nix</filename> to override Nix
+   packages. It must be a function that takes pkgs as an argument and returns a
    modified set of packages.
 <programlisting>
 {
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index da664394f2624..a41240570c6d7 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -6,17 +6,17 @@
   <title>Introduction</title>
 
   <para>
-   "Cross-compilation" means compiling a program on one machine for another
-   type of machine. For example, a typical use of cross compilation is to
-   compile programs for embedded devices. These devices often don't have the
-   computing power and memory to compile their own programs. One might think
-   that cross-compilation is a fairly niche concern, but there are advantages
-   to being rigorous about distinguishing build-time vs run-time environments
-   even when one is developing and deploying on the same machine. Nixpkgs is
-   increasingly adopting the opinion that packages should be written with
-   cross-compilation in mind, and nixpkgs should evaluate in a similar way (by
-   minimizing cross-compilation-specific special cases) whether or not one is
-   cross-compiling.
+   "Cross-compilation" means compiling a program on one machine for another type
+   of machine. For example, a typical use of cross-compilation is to compile
+   programs for embedded devices. These devices often don't have the computing
+   power and memory to compile their own programs. One might think that
+   cross-compilation is a fairly niche concern. However, there are significant
+   advantages to rigorously distinguishing between build-time and run-time
+   environments! This applies even when one is developing and deploying on the
+   same machine. Nixpkgs is increasingly adopting the opinion that packages
+   should be written with cross-compilation in mind, and nixpkgs should evaluate
+   in a similar way (by minimizing cross-compilation-specific special cases)
+   whether or not one is cross-compiling.
   </para>
 
   <para>
@@ -34,15 +34,15 @@
    <title>Platform parameters</title>
 
    <para>
-    Nixpkgs follows the
-    <link xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html">common
-    historical convention of GNU autoconf</link> of distinguishing between 3
-    types of platform: <wordasword>build</wordasword>,
-    <wordasword>host</wordasword>, and <wordasword>target</wordasword>. In
-    summary, <wordasword>build</wordasword> is the platform on which a package
-    is being built, <wordasword>host</wordasword> is the platform on which it
-    is to run. The third attribute, <wordasword>target</wordasword>, is
-    relevant only for certain specific compilers and build tools.
+     Nixpkgs follows the <link
+     xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html">conventions
+     of GNU autoconf</link>. We distinguish between 3 types of platforms when
+     building a derivation: <wordasword>build</wordasword>,
+     <wordasword>host</wordasword>, and <wordasword>target</wordasword>. In
+     summary, <wordasword>build</wordasword> is the platform on which a package
+     is being built, <wordasword>host</wordasword> is the platform on which it
+     will run. The third attribute, <wordasword>target</wordasword>, is relevant
+     only for certain specific compilers and build tools.
    </para>
 
    <para>
@@ -64,7 +64,7 @@
       <para>
        The "build platform" is the platform on which a package is built. Once
        someone has a built package, or pre-built binary package, the build
-       platform should not matter and be safe to ignore.
+       platform should not matter and can be ignored.
       </para>
      </listitem>
     </varlistentry>
@@ -94,11 +94,11 @@
       <para>
        The build process of certain compilers is written in such a way that the
        compiler resulting from a single build can itself only produce binaries
-       for a single platform. The task specifying this single "target platform"
-       is thus pushed to build time of the compiler. The root cause of this
-       mistake is often that the compiler (which will be run on the host) and
-       the the standard library/runtime (which will be run on the target) are
-       built by a single build process.
+       for a single platform. The task of specifying this single "target
+       platform" is thus pushed to build time of the compiler. The root cause of
+       this that the compiler (which will be run on the host) and the standard
+       library/runtime (which will be run on the target) are built by a single
+       build process.
       </para>
       <para>
        There is no fundamental need to think about a single target ahead of
@@ -135,8 +135,10 @@
       <para>
        This is a two-component shorthand for the platform. Examples of this
        would be "x86_64-darwin" and "i686-linux"; see
-       <literal>lib.systems.doubles</literal> for more. This format isn't very
-       standard, but has built-in support in Nix, such as the
+       <literal>lib.systems.doubles</literal> for more. The first component
+       corresponds to the CPU architecture of the platform and the second to the
+       operating system of the platform (<literal>[cpu]-[os]</literal>). This
+       format has built-in support in Nix, such as the
        <varname>builtins.currentSystem</varname> impure string.
       </para>
      </listitem>
@@ -147,12 +149,13 @@
      </term>
      <listitem>
       <para>
-       This is a 3- or 4- component shorthand for the platform. Examples of
-       this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14".
-       This is a standard format called the "LLVM target triple", as they are
-       pioneered by LLVM and traditionally just used for the
-       <varname>targetPlatform</varname>. This format is strictly more
-       informative than the "Nix host double", as the previous format could
+       This is a 3- or 4- component shorthand for the platform. Examples of this
+       would be <literal>x86_64-unknown-linux-gnu</literal> and
+       <literal>aarch64-apple-darwin14</literal>. This is a standard format
+       called the "LLVM target triple", as they are pioneered by LLVM. In the
+       4-part form, this corresponds to
+       <literal>[cpu]-[vendor]-[os]-[abi]</literal>. This format is strictly
+       more informative than the "Nix host double", as the previous format could
        analogously be termed. This needs a better name than
        <varname>config</varname>!
       </para>
@@ -164,12 +167,11 @@
      </term>
      <listitem>
       <para>
-       This is a nix representation of a parsed LLVM target triple with
-       white-listed components. This can be specified directly, or actually
-       parsed from the <varname>config</varname>. [Technically, only one need
-       be specified and the others can be inferred, though the precision of
-       inference may not be very good.] See
-       <literal>lib.systems.parse</literal> for the exact representation.
+       This is a Nix representation of a parsed LLVM target triple
+       with white-listed components. This can be specified directly,
+       or actually parsed from the <varname>config</varname>. See
+       <literal>lib.systems.parse</literal> for the exact
+       representation.
       </para>
      </listitem>
     </varlistentry>
@@ -193,7 +195,7 @@
      <listitem>
       <para>
        These predicates are defined in <literal>lib.systems.inspect</literal>,
-       and slapped on every platform. They are superior to the ones in
+       and slapped onto every platform. They are superior to the ones in
        <varname>stdenv</varname> as they force the user to be explicit about
        which platform they are inspecting. Please use these instead of those.
       </para>
@@ -221,7 +223,7 @@
 
    <para>
     In this section we explore the relationship between both runtime and
-    buildtime dependencies and the 3 Autoconf platforms.
+    build-time dependencies and the 3 Autoconf platforms.
    </para>
 
    <para>
@@ -249,17 +251,17 @@
    </para>
 
    <para>
-    Some examples will probably make this clearer. If a package is being built
-    with a <literal>(build, host, target)</literal> platform triple of
-    <literal>(foo, bar, bar)</literal>, then its build-time dependencies would
-    have a triple of <literal>(foo, foo, bar)</literal>, and <emphasis>those
-    packages'</emphasis> build-time dependencies would have triple of
-    <literal>(foo, foo, foo)</literal>. In other words, it should take two
-    "rounds" of following build-time dependency edges before one reaches a
-    fixed point where, by the sliding window principle, the platform triple no
-    longer changes. Indeed, this happens with cross compilation, where only
-    rounds of native dependencies starting with the second necessarily coincide
-    with native packages.
+    Some examples will make this clearer. If a package is being built with a
+    <literal>(build, host, target)</literal> platform triple of <literal>(foo,
+    bar, bar)</literal>, then its build-time dependencies would have a triple of
+    <literal>(foo, foo, bar)</literal>, and <emphasis>those packages'</emphasis>
+    build-time dependencies would have a triple of <literal>(foo, foo,
+    foo)</literal>. In other words, it should take two "rounds" of following
+    build-time dependency edges before one reaches a fixed point where, by the
+    sliding window principle, the platform triple no longer changes. Indeed,
+    this happens with cross-compilation, where only rounds of native
+    dependencies starting with the second necessarily coincide with native
+    packages.
    </para>
 
    <note>
@@ -271,23 +273,23 @@
    </note>
 
    <para>
-    How does this work in practice? Nixpkgs is now structured so that
-    build-time dependencies are taken from <varname>buildPackages</varname>,
-    whereas run-time dependencies are taken from the top level attribute set.
-    For example, <varname>buildPackages.gcc</varname> should be used at build
-    time, while <varname>gcc</varname> should be used at run time. Now, for
-    most of Nixpkgs's history, there was no <varname>buildPackages</varname>,
-    and most packages have not been refactored to use it explicitly. Instead,
-    one can use the six (<emphasis>gasp</emphasis>) attributes used for
-    specifying dependencies as documented in
-    <xref linkend="ssec-stdenv-dependencies"/>. We "splice" together the
-    run-time and build-time package sets with <varname>callPackage</varname>,
-    and then <varname>mkDerivation</varname> for each of four attributes pulls
-    the right derivation out. This splicing can be skipped when not cross
-    compiling as the package sets are the same, but is a bit slow for cross
-    compiling. Because of this, a best-of-both-worlds solution is in the works
-    with no splicing or explicit access of <varname>buildPackages</varname>
-    needed. For now, feel free to use either method.
+    How does this work in practice? Nixpkgs is now structured so that build-time
+    dependencies are taken from <varname>buildPackages</varname>, whereas
+    run-time dependencies are taken from the top level attribute set. For
+    example, <varname>buildPackages.gcc</varname> should be used at build-time,
+    while <varname>gcc</varname> should be used at run-time. Now, for most of
+    Nixpkgs's history, there was no <varname>buildPackages</varname>, and most
+    packages have not been refactored to use it explicitly. Instead, one can use
+    the six (<emphasis>gasp</emphasis>) attributes used for specifying
+    dependencies as documented in <xref linkend="ssec-stdenv-dependencies"/>. We
+    "splice" together the run-time and build-time package sets with
+    <varname>callPackage</varname>, and then <varname>mkDerivation</varname> for
+    each of four attributes pulls the right derivation out. This splicing can be
+    skipped when not cross-compiling as the package sets are the same, but is a
+    bit slow for cross-compiling. Because of this, a best-of-both-worlds
+    solution is in the works with no splicing or explicit access of
+    <varname>buildPackages</varname> needed. For now, feel free to use either
+    method.
    </para>
 
    <note>
@@ -305,11 +307,11 @@
    <title>Cross packaging cookbook</title>
 
    <para>
-    Some frequently problems when packaging for cross compilation are good to
-    just spell and answer. Ideally the information above is exhaustive, so this
-    section cannot provide any new information, but its ludicrous and cruel to
-    expect everyone to spend effort working through the interaction of many
-    features just to figure out the same answer to the same common problem.
+    Some frequently encountered problems when packaging for cross-compilation
+    should be answered here. Ideally, the information above is exhaustive, so
+    this section cannot provide any new information, but it is ludicrous and
+    cruel to expect everyone to spend effort working through the interaction of
+    many features just to figure out the same answer to the same common problem.
     Feel free to add to this list!
    </para>
 
@@ -364,17 +366,9 @@
  <section xml:id="sec-cross-usage">
   <title>Cross-building packages</title>
 
-  <note>
-   <para>
-    More information needs to moved from the old wiki, especially
-    <link xlink:href="https://nixos.org/wiki/CrossCompiling" />, for this
-    section.
-   </para>
-  </note>
-
   <para>
    Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in
-   which case there is no cross compiling and everything is built by and for
+   which case there is no cross-compiling and everything is built by and for
    that system, or also with <varname>crossSystem</varname>, in which case
    packages run on the latter, but all building happens on the former. Both
    parameters take the same schema as the 3 (build, host, and target) platforms
@@ -440,15 +434,14 @@ nix-build &lt;nixpkgs&gt; --arg crossSystem.config '&lt;arch&gt;-&lt;os&gt;-&lt;
    build plan or package set. A simple "build vs deploy" dichotomy is adequate:
    the sliding window principle described in the previous section shows how to
    interpolate between the these two "end points" to get the 3 platform triple
-   for each bootstrapping stage. That means for any package a given package
-   set, even those not bound on the top level but only reachable via
-   dependencies or <varname>buildPackages</varname>, the three platforms will
-   be defined as one of <varname>localSystem</varname> or
-   <varname>crossSystem</varname>, with the former replacing the latter as one
-   traverses build-time dependencies. A last simple difference then is
-   <varname>crossSystem</varname> should be null when one doesn't want to
-   cross-compile, while the <varname>*Platform</varname>s are always non-null.
-   <varname>localSystem</varname> is always non-null.
+   for each bootstrapping stage. That means for any package a given package set,
+   even those not bound on the top level but only reachable via dependencies or
+   <varname>buildPackages</varname>, the three platforms will be defined as one
+   of <varname>localSystem</varname> or <varname>crossSystem</varname>, with the
+   former replacing the latter as one traverses build-time dependencies. A last
+   simple difference is that <varname>crossSystem</varname> should be null when
+   one doesn't want to cross-compile, while the <varname>*Platform</varname>s
+   are always non-null. <varname>localSystem</varname> is always non-null.
   </para>
  </section>
 <!--============================================================-->
@@ -461,14 +454,14 @@ nix-build &lt;nixpkgs&gt; --arg crossSystem.config '&lt;arch&gt;-&lt;os&gt;-&lt;
 
   <note>
    <para>
-    If one explores nixpkgs, they will see derivations with names like
-    <literal>gccCross</literal>. Such <literal>*Cross</literal> derivations is
-    a holdover from before we properly distinguished between the host and
-    target platforms —the derivation with "Cross" in the name covered the
-    <literal>build = host != target</literal> case, while the other covered the
-    <literal>host = target</literal>, with build platform the same or not based
-    on whether one was using its <literal>.nativeDrv</literal> or
-    <literal>.crossDrv</literal>. This ugliness will disappear soon.
+    If one explores Nixpkgs, they will see derivations with names like
+    <literal>gccCross</literal>. Such <literal>*Cross</literal> derivations is a
+    holdover from before we properly distinguished between the host and target
+    platforms—the derivation with "Cross" in the name covered the <literal>build
+    = host != target</literal> case, while the other covered the <literal>host =
+    target</literal>, with build platform the same or not based on whether one
+    was using its <literal>.nativeDrv</literal> or <literal>.crossDrv</literal>.
+    This ugliness will disappear soon.
    </para>
   </note>
  </section>
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index e96e84bfe72fd..d18e282c5bd34 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -12,7 +12,7 @@
   <para>
    The Nix language allows a derivation to produce multiple outputs, which is
    similar to what is utilized by other Linux distribution packaging systems.
-   The outputs reside in separate nix store paths, so they can be mostly
+   The outputs reside in separate Nix store paths, so they can be mostly
    handled independently of each other, including passing to build inputs,
    garbage collection or binary substitution. The exception is that building
    from source always produces all the outputs.
diff --git a/doc/overlays.xml b/doc/overlays.xml
index 90dd163072d3c..bff2339ca9338 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -3,9 +3,9 @@
          xml:id="chap-overlays">
  <title>Overlays</title>
  <para>
-  This chapter describes how to extend and change Nixpkgs packages using
-  overlays. Overlays are used to add layers in the fix-point used by Nixpkgs to
-  compose the set of all packages.
+  This chapter describes how to extend and change Nixpkgs using overlays.
+  Overlays are used to add layers in the fixed-point used by Nixpkgs to compose
+  the set of all packages.
  </para>
  <para>
   Nixpkgs can be configured with a list of overlays, which are applied in
@@ -60,7 +60,7 @@
       <para>
        First, if an
        <link xlink:href="#sec-overlays-argument"><varname>overlays</varname>
-       argument</link> to the nixpkgs function itself is given, then that is
+       argument</link> to the Nixpkgs function itself is given, then that is
        used and no path lookup will be performed.
       </para>
      </listitem>
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 49f94f3bd5d22..803d343aa0969 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -205,7 +205,7 @@ $ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \
 
   <para>
    Nixpkgs provides a number of packages that will install Eclipse in its
-   various forms, these range from the bare-bones Eclipse Platform to the more
+   various forms. These range from the bare-bones Eclipse Platform to the more
    fully featured Eclipse SDK or Scala-IDE packages and multiple version are
    often available. It is possible to list available Eclipse packages by
    issuing the command:
diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml
index cde27b8a5edfc..6050271dbf6f9 100644
--- a/doc/platform-notes.xml
+++ b/doc/platform-notes.xml
@@ -6,13 +6,13 @@
   <title>Darwin (macOS)</title>
 
   <para>
-   Some common issues when packaging software for darwin:
+   Some common issues when packaging software for Darwin:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     The darwin <literal>stdenv</literal> uses clang instead of gcc. When
+     The Darwin <literal>stdenv</literal> uses clang instead of gcc. When
      referring to the compiler <varname>$CC</varname> or <command>cc</command>
      will work in both cases. Some builds hardcode gcc/g++ in their build
      scripts, that can usually be fixed with using something like
@@ -31,7 +31,7 @@
    </listitem>
    <listitem>
     <para>
-     On darwin libraries are linked using absolute paths, libraries are
+     On Darwin, libraries are linked using absolute paths, libraries are
      resolved by their <literal>install_name</literal> at link time. Sometimes
      packages won't set this correctly causing the library lookups to fail at
      runtime. This can be fixed by adding extra linker flags or by running
@@ -96,8 +96,8 @@
     </programlisting>
     <para>
      The package <literal>xcbuild</literal> can be used to build projects that
-     really depend on Xcode, however projects that build some kind of graphical
-     interface won't work without using Xcode in an impure way.
+     really depend on Xcode. However, this replacement is not 100%
+     compatible with Xcode and can occasionally cause issues.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml
index 849bb9316c608..5618567e38528 100644
--- a/doc/reviewing-contributions.xml
+++ b/doc/reviewing-contributions.xml
@@ -17,22 +17,20 @@
   </para>
  </warning>
  <para>
-  The nixpkgs project receives a fairly high number of contributions via GitHub
-  pull-requests. Reviewing and approving these is an important task and a way
+  The Nixpkgs project receives a fairly high number of contributions via GitHub
+  pull requests. Reviewing and approving these is an important task and a way
   to contribute to the project.
  </para>
  <para>
-  The high change rate of nixpkgs makes any pull request that remains open for
+  The high change rate of Nixpkgs makes any pull request that remains open for
   too long subject to conflicts that will require extra work from the submitter
-  or the merger. Reviewing pull requests in a timely manner and being
-  responsive to the comments is the key to avoid these. GitHub provides sort
-  filters that can be used to see the
-  <link
-    xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most
-  recently</link> and the
-  <link
-    xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc">least
-  recently</link> updated pull-requests. We highly encourage looking at
+  or the merger. Reviewing pull requests in a timely manner and being responsive
+  to the comments is the key to avoid this issue. GitHub provides sort filters
+  that can be used to see the <link
+  xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most
+  recently</link> and the <link
+  xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc">least
+  recently</link> updated pull requests. We highly encourage looking at
   <link xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+review%3Anone+status%3Asuccess+-label%3A%222.status%3A+work-in-progress%22+no%3Aproject+no%3Aassignee+no%3Amilestone">
   this list of ready to merge, unreviewed pull requests</link>.
  </para>
@@ -43,12 +41,12 @@
  </para>
  <para>
   GitHub provides reactions as a simple and quick way to provide feedback to
-  pull-requests or any comments. The thumb-down reaction should be used with
+  pull requests or any comments. The thumb-down reaction should be used with
   care and if possible accompanied with some explanation so the submitter has
   directions to improve their contribution.
  </para>
  <para>
-  Pull-request reviews should include a list of what has been reviewed in a
+  pull request reviews should include a list of what has been reviewed in a
   comment, so other reviewers and mergers can know the state of the review.
  </para>
  <para>
@@ -60,8 +58,8 @@
   <title>Package updates</title>
 
   <para>
-   A package update is the most trivial and common type of pull-request. These
-   pull-requests mainly consist of updating the version part of the package
+   A package update is the most trivial and common type of pull request. These
+   pull requests mainly consist of updating the version part of the package
    name and the source hash.
   </para>
 
@@ -77,7 +75,7 @@
   <itemizedlist>
    <listitem>
     <para>
-     Add labels to the pull-request. (Requires commit rights)
+     Add labels to the pull request. (Requires commit rights)
     </para>
     <itemizedlist>
      <listitem>
@@ -144,8 +142,8 @@
     <itemizedlist>
      <listitem>
       <para>
-       Pull-requests are often targeted to the master or staging branch, and
-       building the pull-request locally when it is submitted can trigger many
+       pull requests are often targeted to the master or staging branch, and
+       building the pull request locally when it is submitted can trigger many
        source builds.
       </para>
       <para>
@@ -174,14 +172,14 @@ $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD <co
         </callout>
         <callout arearefs='reviewing-rebase-3'>
          <para>
-          Fetching the pull-request changes, <varname>PRNUMBER</varname> is the
-          number at the end of the pull-request title and
-          <varname>BASEBRANCH</varname> the base branch of the pull-request.
+          Fetching the pull request changes, <varname>PRNUMBER</varname> is the
+          number at the end of the pull request title and
+          <varname>BASEBRANCH</varname> the base branch of the pull request.
          </para>
         </callout>
         <callout arearefs='reviewing-rebase-4'>
          <para>
-          Rebasing the pull-request changes to the nixos-unstable branch.
+          Rebasing the pull request changes to the nixos-unstable branch.
          </para>
         </callout>
        </calloutlist>
@@ -190,10 +188,10 @@ $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD <co
      <listitem>
       <para>
        The <link xlink:href="https://github.com/madjar/nox">nox</link> tool can
-       be used to review a pull-request content in a single command. It doesn't
+       be used to review a pull request content in a single command. It doesn't
        rebase on a channel branch so it might trigger multiple source builds.
        <varname>PRNUMBER</varname> should be replaced by the number at the end
-       of the pull-request title.
+       of the pull request title.
       </para>
 <screen>
 $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
@@ -230,7 +228,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
   <title>New packages</title>
 
   <para>
-   New packages are a common type of pull-requests. These pull requests
+   New packages are a common type of pull requests. These pull requests
    consists in adding a new nix-expression for a package.
   </para>
 
@@ -241,7 +239,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
   <itemizedlist>
    <listitem>
     <para>
-     Add labels to the pull-request. (Requires commit rights)
+     Add labels to the pull request. (Requires commit rights)
     </para>
     <itemizedlist>
      <listitem>
@@ -279,7 +277,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
      </listitem>
      <listitem>
       <para>
-       A maintainer must be set, this can be the package submitter or a
+       A maintainer must be set. This can be the package submitter or a
        community member that accepts to take maintainership of the package.
       </para>
      </listitem>
@@ -361,7 +359,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
   <itemizedlist>
    <listitem>
     <para>
-     Add labels to the pull-request. (Requires commit rights)
+     Add labels to the pull request. (Requires commit rights)
     </para>
     <itemizedlist>
      <listitem>
@@ -474,7 +472,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
   <itemizedlist>
    <listitem>
     <para>
-     Add labels to the pull-request. (Requires commit rights)
+     Add labels to the pull request. (Requires commit rights)
     </para>
     <itemizedlist>
      <listitem>
@@ -576,7 +574,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
    like to be a long-term reviewer for related submissions, please contact the
    current reviewers for that topic. They will give you information about the
    reviewing process. The main reviewers for a topic can be hard to find as
-   there is no list, but checking past pull-requests to see who reviewed or
+   there is no list, but checking past pull requests to see who reviewed or
    git-blaming the code to see who committed to that topic can give some hints.
   </para>
 
@@ -586,7 +584,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
   </para>
  </section>
  <section xml:id="reviewing-contributions--merging-pull-requests">
-  <title>Merging pull-requests</title>
+  <title>Merging pull requests</title>
 
   <para>
    It is possible for community members that have enough knowledge and
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index d27adc0de5a64..208b5e9cf3029 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -228,18 +228,19 @@ genericBuild
   </para>
 
   <para>
-   The extension of <envar>PATH</envar> with dependencies, alluded to above,
-   proceeds according to the relative platforms alone. The process is carried
-   out only for dependencies whose host platform matches the new derivation's
-   build platform–i.e. which run on the platform where the new derivation
-   will be built.
+   The extension of <envar>PATH</envar> with dependencies, alluded to
+   above, proceeds according to the relative platforms alone. The
+   process is carried out only for dependencies whose host platform
+   matches the new derivation's build platform i.e. dependencies which
+   run on the platform where the new derivation will be built.
    <footnote xml:id="footnote-stdenv-native-dependencies-in-path">
     <para>
-     Currently, that means for native builds all dependencies are put on the
-     <envar>PATH</envar>. But in the future that may not be the case for sake
-     of matching cross: the platforms would be assumed to be unique for native
-     and cross builds alike, so only the <varname>depsBuild*</varname> and
-     <varname>nativeBuildDependencies</varname> dependencies would affect the
+     Currently, this means for native builds all dependencies are put
+     on the <envar>PATH</envar>. But in the future that may not be the
+     case for sake of matching cross: the platforms would be assumed
+     to be unique for native and cross builds alike, so only the
+     <varname>depsBuild*</varname> and
+     <varname>nativeBuildInputs</varname> would be added to the
      <envar>PATH</envar>.
     </para>
    </footnote>
@@ -251,28 +252,27 @@ genericBuild
   <para>
    The dependency is propagated when it forces some of its other-transitive
    (non-immediate) downstream dependencies to also take it on as an immediate
-   dependency. Nix itself already takes a package's transitive dependencies
-   into account, but this propagation ensures nixpkgs-specific infrastructure
-   like setup hooks (mentioned above) also are run as if the propagated
-   dependency.
+   dependency. Nix itself already takes a package's transitive dependencies into
+   account, but this propagation ensures nixpkgs-specific infrastructure like
+   setup hooks (mentioned above) also are run as if the propagated dependency.
   </para>
 
   <para>
-   It is important to note dependencies are not necessary propagated as the
-   same sort of dependency that they were before, but rather as the
+   It is important to note that dependencies are not necessarily propagated as
+   the same sort of dependency that they were before, but rather as the
    corresponding sort so that the platform rules still line up. The exact rules
-   for dependency propagation can be given by assigning each sort of dependency
-   two integers based one how it's host and target platforms are offset from
-   the depending derivation's platforms. Those offsets are given are given
-   below in the descriptions of each dependency list attribute.
-   Algorithmically, we traverse propagated inputs, accumulating every
-   propagated dep's propagated deps and adjusting them to account for the
-   "shift in perspective" described by the current dep's platform offsets. This
-   results in sort a transitive closure of the dependency relation, with the
-   offsets being approximately summed when two dependency links are combined.
-   We also prune transitive deps whose combined offsets go out-of-bounds, which
-   can be viewed as a filter over that transitive closure removing dependencies
-   that are blatantly absurd.
+   for dependency propagation can be given by assigning to each dependency two
+   integers based one how its host and target platforms are offset from the
+   depending derivation's platforms. Those offsets are given below in the
+   descriptions of each dependency list attribute. Algorithmically, we traverse
+   propagated inputs, accumulating every propagated dependency's propagated
+   dependencies and adjusting them to account for the "shift in perspective"
+   described by the current dependency's platform offsets. This results in sort
+   a transitive closure of the dependency relation, with the offsets being
+   approximately summed when two dependency links are combined. We also prune
+   transitive dependencies whose combined offsets go out-of-bounds, which can be
+   viewed as a filter over that transitive closure removing dependencies that
+   are blatantly absurd.
   </para>
 
   <para>
@@ -287,8 +287,8 @@ genericBuild
      propagation logic.
     </para>
    </footnote>
-   They're confusing in very different ways so...hopefully if something doesn't
-   make sense in one presentation, it does in the other!
+   They're confusing in very different ways so... hopefully if something doesn't
+   make sense in one presentation, it will in the other!
 <programlisting>
 let mapOffset(h, t, i) = i + (if i &lt;= 0 then h else t - 1)
 
@@ -307,13 +307,13 @@ dep(h0, _, A, B)
 propagated-dep(h1, t1, B, C)
 h0 + h1 in {-1, 0, 1}
 h0 + t1 in {-1, 0, -1}
--------------------------------------- Take immediate deps' propagated deps
+----------------------------- Take immediate dependencies' propagated dependencies
 propagated-dep(mapOffset(h0, t0, h1),
                mapOffset(h0, t0, t1),
                A, C)</programlisting>
 <programlisting>
 propagated-dep(h, t, A, B)
--------------------------------------- Propagated deps count as deps
+----------------------------- Propagated dependencies count as dependencies
 dep(h, t, A, B)</programlisting>
    Some explanation of this monstrosity is in order. In the common case, the
    target offset of a dependency is the successor to the target offset:
@@ -324,31 +324,31 @@ let f(h, h + 1, i) = i + (if i &lt;= 0 then h else (h + 1) - 1)
 let f(h, h + 1, i) = i + (if i &lt;= 0 then h else h)
 let f(h, h + 1, i) = i + h
   </programlisting>
-   This is where the "sum-like" comes from above: We can just sum all the host
-   offset to get the host offset of the transitive dependency. The target
-   offset is the transitive dep is simply the host offset + 1, just as it was
-   with the dependencies composed to make this transitive one; it can be
+   This is where "sum-like" comes in from above: We can just sum all of the host
+   offsets to get the host offset of the transitive dependency. The target
+   offset is the transitive dependency is simply the host offset + 1, just as it
+   was with the dependencies composed to make this transitive one; it can be
    ignored as it doesn't add any new information.
   </para>
 
   <para>
-   Because of the bounds checks, the uncommon cases are <literal>h =
-   t</literal> and <literal>h + 2 = t</literal>. In the former case, the
-   motivation for <function>mapOffset</function> is that since its host and
-   target platforms are the same, no transitive dep of it should be able to
-   "discover" an offset greater than its reduced target offsets.
+   Because of the bounds checks, the uncommon cases are <literal>h = t</literal>
+   and <literal>h + 2 = t</literal>. In the former case, the motivation for
+   <function>mapOffset</function> is that since its host and target platforms
+   are the same, no transitive dependency of it should be able to "discover" an
+   offset greater than its reduced target offsets.
    <function>mapOffset</function> effectively "squashes" all its transitive
    dependencies' offsets so that none will ever be greater than the target
    offset of the original <literal>h = t</literal> package. In the other case,
-   <literal>h + 1</literal> is skipped over between the host and target
-   offsets. Instead of squashing the offsets, we need to "rip" them apart so no
+   <literal>h + 1</literal> is skipped over between the host and target offsets.
+   Instead of squashing the offsets, we need to "rip" them apart so no
    transitive dependencies' offset is that one.
   </para>
 
   <para>
-   Overall, the unifying theme here is that propagation shouldn't be
-   introducing transitive dependencies involving platforms the needing package
-   is unaware of. The offset bounds checking and definition of
+   Overall, the unifying theme here is that propagation shouldn't be introducing
+   transitive dependencies involving platforms the depending package is unaware
+   of. The offset bounds checking and definition of
    <function>mapOffset</function> together ensure that this is the case.
    Discovering a new offset is discovering a new platform, and since those
    platforms weren't in the derivation "spec" of the needing package, they
@@ -369,20 +369,20 @@ let f(h, h + 1, i) = i + h
       A list of dependencies whose host and target platforms are the new
       derivation's build platform. This means a <literal>-1</literal> host and
       <literal>-1</literal> target offset from the new derivation's platforms.
-      They are programs/libraries used at build time that furthermore produce
-      programs/libraries also used at build time. If the dependency doesn't
-      care about the target platform (i.e. isn't a compiler or similar tool),
-      put it in <varname>nativeBuildInputs</varname> instead. The most common
-      use for this <literal>buildPackages.stdenv.cc</literal>, the default C
-      compiler for this role. That example crops up more than one might think
-      in old commonly used C libraries.
+      These are programs and libraries used at build time that produce programs
+      and libraries also used at build time. If the dependency doesn't care
+      about the target platform (i.e. isn't a compiler or similar tool), put it
+      in <varname>nativeBuildInputs</varname> instead. The most common use of
+      this <literal>buildPackages.stdenv.cc</literal>, the default C compiler
+      for this role. That example crops up more than one might think in old
+      commonly used C libraries.
      </para>
      <para>
-      Since these packages are able to be run at build time, that are always
+      Since these packages are able to be run at build-time, they are always
       added to the <envar>PATH</envar>, as described above. But since these
       packages are only guaranteed to be able to run then, they shouldn't
-      persist as run-time dependencies. This isn't currently enforced, but
-      could be in the future.
+      persist as run-time dependencies. This isn't currently enforced, but could
+      be in the future.
      </para>
     </listitem>
    </varlistentry>
@@ -395,21 +395,20 @@ let f(h, h + 1, i) = i + h
       A list of dependencies whose host platform is the new derivation's build
       platform, and target platform is the new derivation's host platform. This
       means a <literal>-1</literal> host offset and <literal>0</literal> target
-      offset from the new derivation's platforms. They are programs/libraries
-      used at build time that, if they are a compiler or similar tool, produce
-      code to run at run time—i.e. tools used to build the new derivation. If
-      the dependency doesn't care about the target platform (i.e. isn't a
-      compiler or similar tool), put it here, rather than in
+      offset from the new derivation's platforms. These are programs and
+      libraries used at build-time that, if they are a compiler or similar tool,
+      produce code to run at run-time—i.e. tools used to build the new
+      derivation. If the dependency doesn't care about the target platform (i.e.
+      isn't a compiler or similar tool), put it here, rather than in
       <varname>depsBuildBuild</varname> or <varname>depsBuildTarget</varname>.
-      This would be called <varname>depsBuildHost</varname> but for historical
-      continuity.
+      This could be called <varname>depsBuildHost</varname> but
+      <varname>nativeBuildInputs</varname> is used for historical continuity.
      </para>
      <para>
-      Since these packages are able to be run at build time, that are added to
-      the <envar>PATH</envar>, as described above. But since these packages
-      only are guaranteed to be able to run then, they shouldn't persist as
-      run-time dependencies. This isn't currently enforced, but could be in the
-      future.
+      Since these packages are able to be run at build-time, they are added to
+      the <envar>PATH</envar>, as described above. But since these packages are
+      only guaranteed to be able to run then, they shouldn't persist as run-time
+      dependencies. This isn't currently enforced, but could be in the future.
      </para>
     </listitem>
    </varlistentry>
@@ -422,34 +421,33 @@ let f(h, h + 1, i) = i + h
       A list of dependencies whose host platform is the new derivation's build
       platform, and target platform is the new derivation's target platform.
       This means a <literal>-1</literal> host offset and <literal>1</literal>
-      target offset from the new derivation's platforms. They are programs used
-      at build time that produce code to run at run with code produced by the
-      depending package. Most commonly, these would tools used to build the
-      runtime or standard library the currently-being-built compiler will
-      inject into any code it compiles. In many cases, the currently-being
-      built compiler is itself employed for that task, but when that compiler
-      won't run (i.e. its build and host platform differ) this is not possible.
-      Other times, the compiler relies on some other tool, like binutils, that
-      is always built separately so the dependency is unconditional.
+      target offset from the new derivation's platforms. These are programs used
+      at build time that produce code to run with code produced by the depending
+      package. Most commonly, these are tools used to build the runtime or
+      standard library that the currently-being-built compiler will inject into
+      any code it compiles. In many cases, the currently-being-built-compiler is
+      itself employed for that task, but when that compiler won't run (i.e. its
+      build and host platform differ) this is not possible. Other times, the
+      compiler relies on some other tool, like binutils, that is always built
+      separately so that the dependency is unconditional.
      </para>
      <para>
-      This is a somewhat confusing dependency to wrap ones head around, and for
-      good reason. As the only one where the platform offsets are not adjacent
-      integers, it requires thinking of a bootstrapping stage
-      <emphasis>two</emphasis> away from the current one. It and it's use-case
-      go hand in hand and are both considered poor form: try not to need this
-      sort dependency, and try not avoid building standard libraries / runtimes
+      This is a somewhat confusing concept to wrap one’s head around, and for
+      good reason. As the only dependency type where the platform offsets are
+      not adjacent integers, it requires thinking of a bootstrapping stage
+      <emphasis>two</emphasis> away from the current one. It and its use-case go
+      hand in hand and are both considered poor form: try to not need this sort
+      of dependency, and try to avoid building standard libraries and runtimes
       in the same derivation as the compiler produces code using them. Instead
       strive to build those like a normal library, using the newly-built
       compiler just as a normal library would. In short, do not use this
       attribute unless you are packaging a compiler and are sure it is needed.
      </para>
      <para>
-      Since these packages are able to be run at build time, that are added to
-      the <envar>PATH</envar>, as described above. But since these packages
-      only are guaranteed to be able to run then, they shouldn't persist as
-      run-time dependencies. This isn't currently enforced, but could be in the
-      future.
+      Since these packages are able to run at build time, they are added to the
+      <envar>PATH</envar>, as described above. But since these packages are only
+      guaranteed to be able to run then, they shouldn't persist as run-time
+      dependencies. This isn't currently enforced, but could be in the future.
      </para>
     </listitem>
    </varlistentry>
@@ -460,15 +458,15 @@ let f(h, h + 1, i) = i + h
     <listitem>
      <para>
       A list of dependencies whose host and target platforms match the new
-      derivation's host platform. This means a both <literal>0</literal> host
-      offset and <literal>0</literal> target offset from the new derivation's
-      host platform. These are packages used at run-time to generate code also
-      used at run-time. In practice, that would usually be tools used by
-      compilers for metaprogramming/macro systems, or libraries used by the
-      macros/metaprogramming code itself. It's always preferable to use a
-      <varname>depsBuildBuild</varname> dependency in the derivation being
-      built than a <varname>depsHostHost</varname> on the tool doing the
-      building for this purpose.
+      derivation's host platform. This means a <literal>0</literal> host offset
+      and <literal>0</literal> target offset from the new derivation's host
+      platform. These are packages used at run-time to generate code also used
+      at run-time. In practice, this would usually be tools used by compilers
+      for macros or a metaprogramming system, or libraries used by the macros or
+      metaprogramming code itself. It's always preferable to use a
+      <varname>depsBuildBuild</varname> dependency in the derivation being built
+      over a <varname>depsHostHost</varname> on the tool doing the building for
+      this purpose.
      </para>
     </listitem>
    </varlistentry>
@@ -479,20 +477,20 @@ let f(h, h + 1, i) = i + h
     <listitem>
      <para>
       A list of dependencies whose host platform and target platform match the
-      new derivation's. This means a <literal>0</literal> host offset and
+      new derivation's. This means a <literal>0</literal> host offset and a
       <literal>1</literal> target offset from the new derivation's host
       platform. This would be called <varname>depsHostTarget</varname> but for
       historical continuity. If the dependency doesn't care about the target
-      platform (i.e. isn't a compiler or similar tool), put it here, rather
-      than in <varname>depsBuildBuild</varname>.
+      platform (i.e. isn't a compiler or similar tool), put it here, rather than
+      in <varname>depsBuildBuild</varname>.
      </para>
      <para>
-      These often are programs/libraries used by the new derivation at
+      These are often programs and libraries used by the new derivation at
       <emphasis>run</emphasis>-time, but that isn't always the case. For
-      example, the machine code in a statically linked library is only used at
-      run time, but the derivation containing the library is only needed at
-      build time. Even in the dynamic case, the library may also be needed at
-      build time to appease the linker.
+      example, the machine code in a statically-linked library is only used at
+      run-time, but the derivation containing the library is only needed at
+      build-time. Even in the dynamic case, the library may also be needed at
+      build-time to appease the linker.
      </para>
     </listitem>
    </varlistentry>
@@ -581,7 +579,7 @@ let f(h, h + 1, i) = i + h
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>depsTargetTarget</varname>
+     <varname>depsTargetTargetPropagated</varname>
     </term>
     <listitem>
      <para>
@@ -604,10 +602,10 @@ let f(h, h + 1, i) = i + h
     <listitem>
      <para>
       A natural number indicating how much information to log. If set to 1 or
-      higher, <literal>stdenv</literal> will print moderate debug information
-      during the build. In particular, the <command>gcc</command> and
-      <command>ld</command> wrapper scripts will print out the complete command
-      line passed to the wrapped tools. If set to 6 or higher, the
+      higher, <literal>stdenv</literal> will print moderate debugging
+      information during the build. In particular, the <command>gcc</command>
+      and <command>ld</command> wrapper scripts will print out the complete
+      command line passed to the wrapped tools. If set to 6 or higher, the
       <literal>stdenv</literal> setup script will be run with <literal>set
       -x</literal> tracing. If set to 7 or higher, the <command>gcc</command>
       and <command>ld</command> wrapper scripts will also be run with
@@ -666,11 +664,10 @@ passthru = {
       <literal>hello.baz.value1</literal>. We don't specify any usage or schema
       of <literal>passthru</literal> - it is meant for values that would be
       useful outside the derivation in other parts of a Nix expression (e.g. in
-      other derivations). An example would be to convey some specific
-      dependency of your derivation which contains a program with plugins
-      support. Later, others who make derivations with plugins can use
-      passed-through dependency to ensure that their plugin would be
-      binary-compatible with built program.
+      other derivations). An example would be to convey some specific dependency
+      of your derivation which contains a program with plugins support. Later,
+      others who make derivations with plugins can use passed-through dependency
+      to ensure that their plugin would be binary-compatible with built program.
      </para>
     </listitem>
    </varlistentry>
@@ -836,7 +833,7 @@ passthru = {
        <para>
         Zip files are unpacked using <command>unzip</command>. However,
         <command>unzip</command> is not in the standard environment, so you
-        should add it to <varname>buildInputs</varname> yourself.
+        should add it to <varname>nativeBuildInputs</varname> yourself.
        </para>
       </listitem>
      </varlistentry>
@@ -1078,6 +1075,17 @@ passthru = {
     </varlistentry>
     <varlistentry>
      <term>
+      <varname>prefixKey</varname>
+     </term>
+     <listitem>
+      <para>
+       The key to use when specifying the prefix. By default, this is set to
+       <option>--prefix=</option> as that is used by the majority of packages.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
       <varname>dontAddDisableDepTrack</varname>
      </term>
      <listitem>
@@ -1133,12 +1141,11 @@ passthru = {
        By default, when cross compiling, the configure script has
        <option>--build=...</option> and <option>--host=...</option> passed.
        Packages can instead pass <literal>[ "build" "host" "target" ]</literal>
-       or a subset to control exactly which platform flags are passed.
-       Compilers and other tools should use this to also pass the target
-       platform, for example.
+       or a subset to control exactly which platform flags are passed. Compilers
+       and other tools can use this to also pass the target platform.
        <footnote xml:id="footnote-stdenv-build-time-guessing-impurity">
         <para>
-         Eventually these will be passed when in native builds too, to improve
+         Eventually these will be passed building natively as well, to improve
          determinism: build-time guessing, as is done today, is a risk of
          impurity.
         </para>
@@ -1205,17 +1212,6 @@ passthru = {
     </varlistentry>
     <varlistentry>
      <term>
-      <varname>checkInputs</varname>
-     </term>
-     <listitem>
-      <para>
-       A list of dependencies used by the phase. This gets included in
-       <varname>buildInputs</varname> when <varname>doCheck</varname> is set.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
       <varname>makeFlags</varname>
      </term>
      <listitem>
@@ -1365,6 +1361,18 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
     </varlistentry>
     <varlistentry>
      <term>
+      <varname>checkInputs</varname>
+     </term>
+     <listitem>
+      <para>
+       A list of dependencies used by the phase. This gets included in
+       <varname>nativeBuildInputs</varname> when <varname>doCheck</varname> is
+       set.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
       <varname>preCheck</varname>
      </term>
      <listitem>
@@ -1635,13 +1643,11 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       A package can export a <link
-    linkend="ssec-setup-hooks">setup
-       hook</link> by setting this variable. The setup hook, if defined, is
-       copied to <filename>$out/nix-support/setup-hook</filename>. Environment
-       variables are then substituted in it using
-       <function
-    linkend="fun-substituteAll">substituteAll</function>.
+       A package can export a <link linkend="ssec-setup-hooks">setup hook</link>
+       by setting this variable. The setup hook, if defined, is copied to
+       <filename>$out/nix-support/setup-hook</filename>. Environment variables
+       are then substituted in it using <function
+       linkend="fun-substituteAll">substituteAll</function>.
       </para>
      </listitem>
     </varlistentry>
@@ -2074,12 +2080,12 @@ someVar=$(stripHash $name)
   <title>Package setup hooks</title>
 
   <para>
-   Nix itself considers a build-time dependency merely something that should
+   Nix itself considers a build-time dependency as merely something that should
    previously be built and accessible at build time—packages themselves are
    on their own to perform any additional setup. In most cases, that is fine,
    and the downstream derivation can deal with its own dependencies. But for a
    few common tasks, that would result in almost every package doing the same
-   sort of setup work---depending not on the package itself, but entirely on
+   sort of setup work—depending not on the package itself, but entirely on
    which dependencies were used.
   </para>
 
@@ -2094,20 +2100,19 @@ someVar=$(stripHash $name)
   </para>
 
   <para>
-   The Setup hook mechanism is a bit of a sledgehammer though: a powerful
+   The setup hook mechanism is a bit of a sledgehammer though: a powerful
    feature with a broad and indiscriminate area of effect. The combination of
    its power and implicit use may be expedient, but isn't without costs. Nix
-   itself is unchanged, but the spirit of adding dependencies being effect-free
+   itself is unchanged, but the spirit of added dependencies being effect-free
    is violated even if the letter isn't. For example, if a derivation path is
    mentioned more than once, Nix itself doesn't care and simply makes sure the
    dependency derivation is already built just the same—depending is just
    needing something to exist, and needing is idempotent. However, a dependency
    specified twice will have its setup hook run twice, and that could easily
-   change the build environment (though a well-written setup hook will
-   therefore strive to be idempotent so this is in fact not observable). More
-   broadly, setup hooks are anti-modular in that multiple dependencies, whether
-   the same or different, should not interfere and yet their setup hooks may
-   well do so.
+   change the build environment (though a well-written setup hook will therefore
+   strive to be idempotent so this is in fact not observable). More broadly,
+   setup hooks are anti-modular in that multiple dependencies, whether the same
+   or different, should not interfere and yet their setup hooks may well do so.
   </para>
 
   <para>
@@ -2126,15 +2131,14 @@ someVar=$(stripHash $name)
   <para>
    Packages adding a hook should not hard code a specific hook, but rather
    choose a variable <emphasis>relative</emphasis> to how they are included.
-   Returning to the C compiler wrapper example, if it itself is an
+   Returning to the C compiler wrapper example, if the wrapper itself is an
    <literal>n</literal> dependency, then it only wants to accumulate flags from
    <literal>n + 1</literal> dependencies, as only those ones match the
-   compiler's target platform. The <envar>hostOffset</envar> variable is
-   defined with the current dependency's host offset
-   <envar>targetOffset</envar> with its target offset, before its setup hook is
-   sourced. Additionally, since most environment hooks don't care about the
-   target platform, That means the setup hook can append to the right bash array
-   by doing something like
+   compiler's target platform. The <envar>hostOffset</envar> variable is defined
+   with the current dependency's host offset <envar>targetOffset</envar> with
+   its target offset, before its setup hook is sourced. Additionally, since most
+   environment hooks don't care about the target platform, that means the setup
+   hook can append to the right bash array by doing something like
 <programlisting language="bash">
 addEnvHooks "$hostOffset" myBashFunction
   </programlisting>
@@ -2159,19 +2163,19 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous
-       purposes. These are GNU Binutils when targetting Linux, and a mix of
-       cctools and GNU binutils for Darwin. [The "Bintools" name is supposed to
-       be a compromise between "Binutils" and "cctools" not denoting any
-       specific implementation.] Specifically, the underlying bintools package,
-       and a C standard library (glibc or Darwin's libSystem, just for the
-       dynamic loader) are all fed in, and dependency finding, hardening (see
-       below), and purity checks for each are handled by Bintools Wrapper.
-       Packages typically depend on CC Wrapper, which in turn (at run time)
-       depends on Bintools Wrapper.
+       The Bintools Wrapper wraps the binary utilities for a bunch of
+       miscellaneous purposes. These are GNU Binutils when targetting Linux, and
+       a mix of cctools and GNU binutils for Darwin. [The "Bintools" name is
+       supposed to be a compromise between "Binutils" and "cctools" not denoting
+       any specific implementation.] Specifically, the underlying bintools
+       package, and a C standard library (glibc or Darwin's libSystem, just for
+       the dynamic loader) are all fed in, and dependency finding, hardening
+       (see below), and purity checks for each are handled by the Bintools
+       Wrapper. Packages typically depend on CC Wrapper, which in turn (at run
+       time) depends on the Bintools Wrapper.
       </para>
       <para>
-       Bintools Wrapper was only just recently split off from CC Wrapper, so
+       The Bintools Wrapper was only just recently split off from CC Wrapper, so
        the division of labor is still being worked out. For example, it
        shouldn't care about about the C standard library, but just take a
        derivation with the dynamic loader (which happens to be the glibc on
@@ -2179,24 +2183,24 @@ addEnvHooks "$hostOffset" myBashFunction
        to need to share, and probably the most important to understand. It is
        currently accomplished by collecting directories of host-platform
        dependencies (i.e. <varname>buildInputs</varname> and
-       <varname>nativeBuildInputs</varname>) in environment variables. Bintools
-       Wrapper's setup hook causes any <filename>lib</filename> and
+       <varname>nativeBuildInputs</varname>) in environment variables. The
+       Bintools Wrapper's setup hook causes any <filename>lib</filename> and
        <filename>lib64</filename> subdirectories to be added to
-       <envar>NIX_LDFLAGS</envar>. Since CC Wrapper and Bintools Wrapper use
-       the same strategy, most of the Bintools Wrapper code is sparsely
-       commented and refers to CC Wrapper. But CC Wrapper's code, by contrast,
-       has quite lengthy comments. Bintools Wrapper merely cites those, rather
-       than repeating them, to avoid falling out of sync.
+       <envar>NIX_LDFLAGS</envar>. Since the CC Wrapper and the Bintools Wrapper
+       use the same strategy, most of the Bintools Wrapper code is sparsely
+       commented and refers to the CC Wrapper. But the CC Wrapper's code, by
+       contrast, has quite lengthy comments. The Bintools Wrapper merely cites
+       those, rather than repeating them, to avoid falling out of sync.
       </para>
       <para>
        A final task of the setup hook is defining a number of standard
-       environment variables to tell build systems which executables full-fill
+       environment variables to tell build systems which executables fulfill
        which purpose. They are defined to just be the base name of the tools,
-       under the assumption that Bintools Wrapper's binaries will be on the
+       under the assumption that the Bintools Wrapper's binaries will be on the
        path. Firstly, this helps poorly-written packages, e.g. ones that look
        for just <command>gcc</command> when <envar>CC</envar> isn't defined yet
-       <command>clang</command> is to be used. Secondly, this helps packages
-       not get confused when cross-compiling, in which case multiple Bintools
+       <command>clang</command> is to be used. Secondly, this helps packages not
+       get confused when cross-compiling, in which case multiple Bintools
        Wrappers may simultaneously be in use.
        <footnote xml:id="footnote-stdenv-per-platform-wrapper">
         <para>
@@ -2208,20 +2212,20 @@ addEnvHooks "$hostOffset" myBashFunction
         </para>
        </footnote>
        <envar>BUILD_</envar>- and <envar>TARGET_</envar>-prefixed versions of
-       the normal environment variable are defined for the additional Bintools
+       the normal environment variable are defined for additional Bintools
        Wrappers, properly disambiguating them.
       </para>
       <para>
-       A problem with this final task is that Bintools Wrapper is honest and
+       A problem with this final task is that the Bintools Wrapper is honest and
        defines <envar>LD</envar> as <command>ld</command>. Most packages,
        however, firstly use the C compiler for linking, secondly use
        <envar>LD</envar> anyways, defining it as the C compiler, and thirdly,
-       only so define <envar>LD</envar> when it is undefined as a fallback.
-       This triple-threat means Bintools Wrapper will break those packages, as
-       LD is already defined as the actual linker which the package won't
-       override yet doesn't want to use. The workaround is to define, just for
-       the problematic package, <envar>LD</envar> as the C compiler. A good way
-       to do this would be <command>preConfigure = "LD=$CC"</command>.
+       only so define <envar>LD</envar> when it is undefined as a fallback. This
+       triple-threat means Bintools Wrapper will break those packages, as LD is
+       already defined as the actual linker which the package won't override yet
+       doesn't want to use. The workaround is to define, just for the
+       problematic package, <envar>LD</envar> as the C compiler. A good way to
+       do this would be <command>preConfigure = "LD=$CC"</command>.
       </para>
      </listitem>
     </varlistentry>
@@ -2231,30 +2235,31 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
+       The CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
        Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C
        standard library (glibc or Darwin's libSystem, just for the dynamic
        loader) are all fed in, and dependency finding, hardening (see below),
-       and purity checks for each are handled by CC Wrapper. Packages typically
-       depend on CC Wrapper, which in turn (at run time) depends on Bintools
-       Wrapper.
+       and purity checks for each are handled by the CC Wrapper. Packages
+       typically depend on the CC Wrapper, which in turn (at run-time) depends
+       on the Bintools Wrapper.
       </para>
       <para>
-       Dependency finding is undoubtedly the main task of CC Wrapper. This
-       works just like Bintools Wrapper, except that any
+       Dependency finding is undoubtedly the main task of the CC Wrapper. This
+       works just like the Bintools Wrapper, except that any
        <filename>include</filename> subdirectory of any relevant dependency is
        added to <envar>NIX_CFLAGS_COMPILE</envar>. The setup hook itself
        contains some lengthy comments describing the exact convoluted mechanism
        by which this is accomplished.
       </para>
       <para>
-       CC Wrapper also like Bintools Wrapper defines standard environment
-       variables with the names of the tools it wraps, for the same reasons
-       described above. Importantly, while it includes a <command>cc</command>
-       symlink to the c compiler for portability, the <envar>CC</envar> will be
-       defined using the compiler's "real name" (i.e. <command>gcc</command> or
-       <command>clang</command>). This helps lousy build systems that inspect
-       on the name of the compiler rather than run it.
+       Similarly, the CC Wrapper follows the Bintools Wrapper in defining
+       standard environment variables with the names of the tools it wraps, for
+       the same reasons described above. Importantly, while it includes a
+       <command>cc</command> symlink to the c compiler for portability, the
+       <envar>CC</envar> will be defined using the compiler's "real name" (i.e.
+       <command>gcc</command> or <command>clang</command>). This helps lousy
+       build systems that inspect on the name of the compiler rather than run
+       it.
       </para>
      </listitem>
     </varlistentry>
@@ -2314,9 +2319,11 @@ addEnvHooks "$hostOffset" myBashFunction
      <listitem>
       <para>
        The <varname>autoreconfHook</varname> derivation adds
-       <varname>autoreconfPhase</varname>, which runs autoreconf, libtoolize
-       and automake, essentially preparing the configure script in
-       autotools-based builds.
+       <varname>autoreconfPhase</varname>, which runs autoreconf, libtoolize and
+       automake, essentially preparing the configure script in autotools-based
+       builds. Most autotools-based packages come with the configure script
+       pre-generated, but this hook is necessary for a few packages and when you
+       need to patch the package’s configure scripts.
       </para>
      </listitem>
     </varlistentry>
@@ -2360,9 +2367,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <listitem>
       <para>
-       Exports <envar>GDK_PIXBUF_MODULE_FILE</envar> environment variable the
-       the builder. Add librsvg package to <varname>buildInputs</varname> to
-       get svg support.
+       Exports <envar>GDK_PIXBUF_MODULE_FILE</envar> environment variable to the
+       builder. Add librsvg package to <varname>buildInputs</varname> to get svg
+       support.
       </para>
      </listitem>
     </varlistentry>
@@ -2399,7 +2406,7 @@ addEnvHooks "$hostOffset" myBashFunction
        PaX flags on Linux (where it is available by default; on all other
        platforms, <varname>paxmark</varname> is a no-op). For example, to
        disable secure memory protections on the executable
-       <replaceable>foo</replaceable>:
+       <replaceable>foo</replaceable>
 <programlisting>
       postFixup = ''
         paxmark m $out/bin/<replaceable>foo</replaceable>
@@ -2452,7 +2459,104 @@ addEnvHooks "$hostOffset" myBashFunction
       </para>
      </listitem>
     </varlistentry>
-   </variablelist>
+    <varlistentry>
+     <term>
+      cmake
+     </term>
+     <listitem>
+       <para>
+         Overrides the default configure phase to run the CMake command. By
+	 default, we use the Make generator of CMake. In
+         addition, dependencies are added automatically to CMAKE_PREFIX_PATH so
+         that packages are correctly detected by CMake. Some additional flags
+         are passed in to give similar behavior to configure-based packages. You
+         can disable this hook’s behavior by setting configurePhase to a custom
+         value, or by setting dontUseCmakeConfigure. cmakeFlags controls flags
+         passed only to CMake. By default, parallel building is enabled as CMake
+         supports parallel building almost everywhere. When Ninja is also in
+	 use, CMake will detect that and use the ninja generator.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      xcbuildHook
+     </term>
+     <listitem>
+       <para>
+	 Overrides the build and install phases to run the “xcbuild” command.
+	 This hook is needed when a project only comes with build files for the
+	 XCode build system. You can disable this behavior by setting buildPhase
+	 and configurePhase to a custom value. xcbuildFlags controls flags
+	 passed only to xcbuild.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      meson
+     </term>
+     <listitem>
+       <para>
+	 Overrides the configure phase to run meson to generate Ninja files. You
+	 can disable this behavior by setting configurePhase to a custom value,
+	 or by setting dontUseMesonConfigure. To run these files, you should
+	 accompany meson with ninja. mesonFlags controls only the flags passed
+	 to meson. By default, parallel building is enabled as Meson supports
+	 parallel building almost everywhere.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      ninja
+     </term>
+     <listitem>
+       <para>
+	 Overrides the build, install, and check phase to run ninja instead of
+	 make. You can disable this behavior with the dontUseNinjaBuild,
+	 dontUseNinjaInstall, and dontUseNinjaCheck, respectively. Parallel
+	 building is enabled by default in Ninja.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      unzip
+     </term>
+     <listitem>
+       <para>
+	 This setup hook will allow you to unzip .zip files specified in $src.
+	 There are many similar packages like unrar, undmg, etc.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      wafHook
+     </term>
+     <listitem>
+       <para>
+	 Overrides the configure, build, and install phases. This will run the
+	 "waf" script used by many projects. If waf doesn’t exist, it will copy
+	 the version of waf available in Nixpkgs wafFlags can be used to pass
+	 flags to the waf script.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      scons
+     </term>
+     <listitem>
+       <para>
+	 Overrides the build, install, and check phases. This uses the scons
+	 build system as a replacement for make. scons does not provide a
+	 configure phase, so everything is managed at build and install time.
+      </para>
+     </listitem>
+    </varlistentry>
+  </variablelist>
   </para>
  </section>
  <section xml:id="sec-purity-in-nixpkgs">
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9ccb6dd205e41..7327d4ac4dfd6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -620,6 +620,7 @@
   ./services/networking/supplicant.nix
   ./services/networking/supybot.nix
   ./services/networking/syncthing.nix
+  ./services/networking/syncthing-relay.nix
   ./services/networking/tcpcrypt.nix
   ./services/networking/teamspeak3.nix
   ./services/networking/tinc.nix
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 5f184df34c683..0325c679773b5 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -12,12 +12,22 @@ let
     let
       pName = _p: (builtins.parseDrvName (_p.name)).name;
     in pName mysql == pName pkgs.mariadb;
+  isMysqlAtLeast57 =
+    let
+      pName = _p: (builtins.parseDrvName (_p.name)).name;
+    in (pName mysql == pName pkgs.mysql57)
+       && ((builtins.compareVersions mysql.version "5.7") >= 0);
 
   pidFile = "${cfg.pidDir}/mysqld.pid";
 
+  mysqldAndInstallOptions =
+    "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${mysql}";
   mysqldOptions =
-    "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${mysql} " +
-    "--pid-file=${pidFile}";
+    "${mysqldAndInstallOptions} --pid-file=${pidFile}";
+  # For MySQL 5.7+, --insecure creates the root user without password
+  # (earlier versions and MariaDB do this by default).
+  installOptions =
+    "${mysqldAndInstallOptions} ${lib.optionalString isMysqlAtLeast57 "--insecure"}";
 
   myCnf = pkgs.writeText "my.cnf"
   ''
@@ -253,7 +263,7 @@ in
             if ! test -e ${cfg.dataDir}/mysql; then
                 mkdir -m 0700 -p ${cfg.dataDir}
                 chown -R ${cfg.user} ${cfg.dataDir}
-                ${mysql}/bin/mysql_install_db ${mysqldOptions}
+                ${mysql}/bin/mysql_install_db ${installOptions}
                 touch /tmp/mysql_init
             fi
 
diff --git a/nixos/modules/services/networking/syncthing-relay.nix b/nixos/modules/services/networking/syncthing-relay.nix
new file mode 100644
index 0000000000000..f5ca63e789304
--- /dev/null
+++ b/nixos/modules/services/networking/syncthing-relay.nix
@@ -0,0 +1,121 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.syncthing.relay;
+
+  dataDirectory = "/var/lib/syncthing-relay";
+
+  relayOptions =
+    [
+      "--keys=${dataDirectory}"
+      "--listen=${cfg.listenAddress}:${toString cfg.port}"
+      "--status-srv=${cfg.statusListenAddress}:${toString cfg.statusPort}"
+      "--provided-by=${escapeShellArg cfg.providedBy}"
+    ]
+    ++ optional (cfg.pools != null) "--pools=${escapeShellArg (concatStringsSep "," cfg.pools)}"
+    ++ optional (cfg.globalRateBps != null) "--global-rate=${toString cfg.globalRateBps}"
+    ++ optional (cfg.perSessionRateBps != null) "--per-session-rate=${toString cfg.perSessionRateBps}"
+    ++ cfg.extraOptions;
+in {
+  ###### interface
+
+  options.services.syncthing.relay = {
+    enable = mkEnableOption "Syncthing relay service";
+
+    listenAddress = mkOption {
+      type = types.str;
+      default = "";
+      example = "1.2.3.4";
+      description = ''
+        Address to listen on for relay traffic.
+      '';
+    };
+
+    port = mkOption {
+      type = types.port;
+      default = 22067;
+      description = ''
+        Port to listen on for relay traffic. This port should be added to
+        <literal>networking.firewall.allowedTCPPorts</literal>.
+      '';
+    };
+
+    statusListenAddress = mkOption {
+      type = types.str;
+      default = "";
+      example = "1.2.3.4";
+      description = ''
+        Address to listen on for serving the relay status API.
+      '';
+    };
+
+    statusPort = mkOption {
+      type = types.port;
+      default = 22070;
+      description = ''
+        Port to listen on for serving the relay status API. This port should be
+        added to <literal>networking.firewall.allowedTCPPorts</literal>.
+      '';
+    };
+
+    pools = mkOption {
+      type = types.nullOr (types.listOf types.str);
+      default = null;
+      description = ''
+        Relay pools to join. If null, uses the default global pool.
+      '';
+    };
+
+    providedBy = mkOption {
+      type = types.str;
+      default = "";
+      description = ''
+        Human-readable description of the provider of the relay (you).
+      '';
+    };
+
+    globalRateBps = mkOption {
+      type = types.nullOr types.ints.positive;
+      default = null;
+      description = ''
+        Global bandwidth rate limit in bytes per second.
+      '';
+    };
+
+    perSessionRateBps = mkOption {
+      type = types.nullOr types.ints.positive;
+      default = null;
+      description = ''
+        Per session bandwidth rate limit in bytes per second.
+      '';
+    };
+
+    extraOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        Extra command line arguments to pass to strelaysrv.
+      '';
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    systemd.services.syncthing-relay = {
+      description = "Syncthing relay service";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      serviceConfig = {
+        DynamicUser = true;
+        StateDirectory = baseNameOf dataDirectory;
+
+        Restart = "on-failure";
+        ExecStart = "${pkgs.syncthing-relay}/bin/strelaysrv ${concatStringsSep " " relayOptions}";
+      };
+    };
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index ec7178ec9cad0..0d5a747b5c566 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -193,6 +193,7 @@ in
   strongswan-swanctl = handleTest ./strongswan-swanctl.nix {};
   sudo = handleTest ./sudo.nix {};
   switchTest = handleTest ./switch-test.nix {};
+  syncthing-relay = handleTest ./syncthing-relay.nix {};
   systemd = handleTest ./systemd.nix {};
   taskserver = handleTest ./taskserver.nix {};
   tomcat = handleTest ./tomcat.nix {};
diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix
index b19da251119b7..2b4c1ab7b0529 100644
--- a/nixos/tests/keymap.nix
+++ b/nixos/tests/keymap.nix
@@ -99,7 +99,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
       homerow.expect = [ "a" "r" "s" "t" "n" "e" "i" "o"         ];
     };
 
-    extraConfig.i18n.consoleKeyMap = "en-latin9";
+    extraConfig.i18n.consoleKeyMap = "colemak/colemak";
     extraConfig.services.xserver.layout = "us";
     extraConfig.services.xserver.xkbVariant = "colemak";
   };
diff --git a/nixos/tests/syncthing-relay.nix b/nixos/tests/syncthing-relay.nix
new file mode 100644
index 0000000000000..f1ceb49933374
--- /dev/null
+++ b/nixos/tests/syncthing-relay.nix
@@ -0,0 +1,22 @@
+import ./make-test.nix ({ lib, pkgs, ... }: {
+  name = "syncthing-relay";
+  meta.maintainers = with pkgs.stdenv.lib.maintainers; [ delroth ];
+
+  machine = {
+    environment.systemPackages = [ pkgs.jq ];
+    services.syncthing.relay = {
+      enable = true;
+      providedBy = "nixos-test";
+      pools = [];  # Don't connect to any pool while testing.
+      port = 12345;
+      statusPort = 12346;
+    };
+  };
+
+  testScript = ''
+    $machine->waitForUnit("syncthing-relay.service");
+    $machine->waitForOpenPort(12345);
+    $machine->waitForOpenPort(12346);
+    $machine->succeed("curl http://localhost:12346/status | jq -r '.options.\"provided-by\"'") =~ /nixos-test/ or die;
+  '';
+})
diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix
index 22da11cdd63bb..62e7259287418 100644
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "nano-wallet-${version}";
-  version = "16.2";
+  version = "16.3";
 
   src = fetchFromGitHub {
     owner = "nanocurrency";
     repo = "raiblocks";
     rev = "V${version}";
-    sha256 = "18zp4xl5iwwrnzrqzsygdrym5565v8dpfz0jxczw21896kw1i9i7";
+    sha256 = "1rhq7qzfd8li33pmzcjxrhbbgdklxlcijam62s385f8yqjwy80dz";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
index ece0a70a7e973..5d74db5ec3e0f 100644
--- a/pkgs/applications/audio/padthv1/default.nix
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "padthv1-${version}";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/padthv1/${name}.tar.gz";
-    sha256 = "1alfl0l5qdll0w5lwhrwzj5dina1big1zmjg5imi9h06dzhz51xl";
+    sha256 = "157w28wxggqpqkibz716v3r756q2z78g70ipncpalchb9dfr42b6";
   };
 
   buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index a5dae1d056074..659c0a71e27f2 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -44,13 +44,13 @@ let
   ];
 in stdenv.mkDerivation rec {
   name = "pulseeffects-${version}";
-  version = "4.3.9";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "pulseeffects";
     rev = "v${version}";
-    sha256 = "1vir05hy2n0nk0gaqbn680bx53ixcyi2y0hq4grgm73bbb1jzqq6";
+    sha256 = "0bjzlqyvcp9hxaq07nqr14k9kvan5myaxb7ci30gz0fgayib85lv";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 5146919fde6cb..8938df4d42ded 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.28.1";
+  version = "3.0";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "0wian0gnx0yfxf8x9b8wr57fjd6rnmi3y3xj83ni6x0xqrjnf1lp";
+    sha256 = "00fwf8yz7k8vzd30ly5ndlj6ax9w85dkjzjnlk95vd0zdrf4wyxn";
   };
 
   outputs = [ "out" "man" "doc" ];
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 26781e84cce4d..25095f04d0193 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -47,6 +47,8 @@ stdenv.mkDerivation rec {
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
     gsl poppler imagemagick libwpg librevenge
     libvisio libcdr libexif potrace hicolor-icon-theme
+
+    python2Env perlPackages.perl
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index f7c1990ef3c86..03d34558413ee 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "5.2.4";
+  version = "5.2.5";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "1zwbqr5s76r77x7klydpqbaqakzzilzv92ddyck1sj5jiy5prwpp";
+    sha256 = "0xjggjq2brhi9x3i4d7hqfi18cd8czs6rzvihvspfxaqilsai0dm";
   };
 
   installPhase = ''
diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix
index 15904ab7c0ab9..d153826193976 100644
--- a/pkgs/applications/misc/mwic/default.nix
+++ b/pkgs/applications/misc/mwic/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.6";
+  version = "0.7.7";
   name = "mwic-${version}";
 
   src = fetchurl {
     url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz";
-    sha256 = "0dl56979i54hrmz5l27c4q1f7jd1bpkmi7sm86946dagi4l1ns3i";
+    sha256 = "0l4anwiiqclymx0awwn4hzaj8n26ycg8nz76wjphsyscn7z2awad";
   };
 
   makeFlags=["PREFIX=\${out}"];
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 661985086061a..aa59daa168e24 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -15,6 +15,7 @@
 , libXScrnSaver, libXcursor, libXtst, libGLU_combined
 , protobuf, speechd, libXdamage, cups
 , ffmpeg, libxslt, libxml2, at-spi2-core
+, jdk
 
 # optional dependencies
 , libgcrypt ? null # gnomeSupport || cupsSupport
@@ -125,7 +126,8 @@ let
       ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
       ++ optionals cupsSupport [ libgcrypt cups ]
       ++ optional pulseSupport libpulseaudio
-      ++ optional (versionAtLeast version "71") at-spi2-core;
+      ++ optional (versionAtLeast version "71") at-spi2-core
+      ++ optional (versionAtLeast version "72") jdk.jre;
 
     patches = optional enableWideVine ./patches/widevine.patch ++ [
       ./patches/nix_plugin_paths_68.patch
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 9f6e304c21e63..c2a73480b987d 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "04y78dqm19cr5929l727fk0jqqsdfyrdv50gippg32dplvw0r4fw";
-    sha256bin64 = "1rfclq9vwj61pv1sqpa4v26iby02j05lad673c79f0032v2v2r43";
-    version = "71.0.3578.44";
+    sha256 = "0nxxqfncw9ci3rhg8fiqaxy6zvh9x3j10lw8yw7c0cg2yni10qsp";
+    sha256bin64 = "0frcaplyzhkxzzcfcf0vigqpzixar4jg9hhrh4i8z8vx2gnxkwwy";
+    version = "71.0.3578.53";
   };
   dev = {
-    sha256 = "1d18957kwy3hp3dhgahip3pgjhvvadix5h3mk2d7w6zdj3l8c8kq";
-    sha256bin64 = "1yny1hyis91ajn7b8v9b4fzgswzwng3rndf1jb807xd6jd461afz";
-    version = "72.0.3608.4";
+    sha256 = "11bsn77kvjqdwpiwjf4gaindfj0sx932wp6g7cald0638wdz7pqv";
+    sha256bin64 = "1j5pd8imc35ch7l3jmnmjm2yda2xzdwha5im34240wm6rrdr2v2j";
+    version = "72.0.3610.2";
   };
   stable = {
-    sha256 = "0amc3czac897mb80qcwwladmhg2yps8r2c359nzyj7i7bq1m992d";
-    sha256bin64 = "1did6kp7dhlqp7rarvly7ywb9n9hnhhb3zgpkh3yp3f2skqrr5w8";
-    version = "70.0.3538.102";
+    sha256 = "0bwlq5xii26b3yngwkwb7l2mx03c30ffpym4xg0hcci8ry7zhpj4";
+    sha256bin64 = "1gnhjbpkp2gn3y5pingwv153bakidq60pr4fj2iq1kniyllsmmpg";
+    version = "70.0.3538.110";
   };
 }
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 583b6a06aeabd..8c97186b59a4b 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -58,6 +58,7 @@ let
 
           passthru = {
             withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins);
+            full = withPlugins lib.attrValues;
 
             # Ouch
             overrideDerivation = f: (pluggable (terraform.overrideDerivation f)).withPlugins plugins;
@@ -86,41 +87,22 @@ let
 
   plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"];
 in rec {
-  terraform_0_8_5 = generic {
-    version = "0.8.5";
-    sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
-  };
-
-  terraform_0_8 = generic {
-    version = "0.8.8";
-    sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
-  };
-
-  terraform_0_9 = generic {
-    version = "0.9.11";
-    sha256 = "045zcpd4g9c52ynhgh3213p422ahds63mzhmd2iwcmj88g8i1w6x";
-    # checks are failing again
-    doCheck = false;
-  };
-
-  terraform_0_10 = pluggable (generic {
-    version = "0.10.8";
-    sha256 = "11hhij0hq99xhwlg5dx5nv7y074x79wkr8hr3wc6ln0kwdk5scdf";
+  terraform_0_11 = pluggable (generic {
+    version = "0.11.10";
+    sha256 = "08mapla89g106bvqr41zfd7l4ki55by6207qlxq9caiha54nx4nb";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });
 
-  terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues;
+  terraform_0_11-full = terraform_0_11.full;
 
-  terraform_0_11 = pluggable (generic {
-    version = "0.11.10";
-    sha256 = "08mapla89g106bvqr41zfd7l4ki55by6207qlxq9caiha54nx4nb";
+  terraform_0_12 = pluggable (generic {
+    version = "0.12.0-alpha2";
+    sha256 = "1rnxgwfk10b1g3jnh9gv4lqrcszhxq8shaqslml30hafs3dkg71q";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });
 
-  terraform_0_11-full = terraform_0_11.withPlugins lib.attrValues;
-
   # Tests that the plugins are being used. Terraform looks at the specific
   # file pattern and if the plugin is not found it will try to download it
   # from the Internet. With sandboxing enable this test will fail if that is
diff --git a/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix b/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix
deleted file mode 100644
index 359579c3fde81..0000000000000
--- a/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
-
-buildGoPackage rec {
-  name = "terragrunt-${version}";
-  version = "0.11.1";
-
-  goPackagePath = "github.com/gruntwork-io/terragrunt";
-
-  src = fetchFromGitHub {
-    rev    = "v${version}";
-    owner  = "gruntwork-io";
-    repo   = "terragrunt";
-    sha256 = "061ix4m64i8bvjpqm6hn83nnkvqrp5y0hh5gzmxiik2nz3by1rx5";
-  };
-
-  goDeps = ./deps_0_11.nix;
-
-  buildInputs = [ makeWrapper ];
-
-  preBuild = ''
-    buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}")
-  '';
-
-  postInstall = ''
-    wrapProgram $bin/bin/terragrunt \
-      --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices.";
-    homepage = https://github.com/gruntwork-io/terragrunt/;
-    license = licenses.mit;
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-}
diff --git a/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix b/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix
deleted file mode 100644
index ec13cbe35bca6..0000000000000
--- a/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
-
-buildGoPackage rec {
-  name = "terragrunt-${version}";
-  version = "0.9.8";
-
-  goPackagePath = "github.com/gruntwork-io/terragrunt";
-
-  src = fetchFromGitHub {
-    rev    = "v${version}";
-    owner  = "gruntwork-io";
-    repo   = "terragrunt";
-    sha256 = "0aakr17yzh5jzvlmg3pzpnsfwl31njg27bpck541492shqcqmkiz";
-  };
-
-  goDeps = ./deps.nix;
-
-  buildInputs = [ makeWrapper ];
-
-  preBuild = ''
-    buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}")
-  '';
-
-  postInstall = ''
-    wrapProgram $bin/bin/terragrunt \
-      --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices.";
-    homepage = https://github.com/gruntwork-io/terragrunt/;
-    license = licenses.mit;
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-}
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 1fe9ad5ccc831..cb8cae47ab360 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform-full, makeWrapper }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
@@ -23,7 +23,7 @@ buildGoPackage rec {
 
   postInstall = ''
     wrapProgram $bin/bin/terragrunt \
-      --set TERRAGRUNT_TFPATH ${lib.getBin terraform-full}/bin/terraform
+      --set TERRAGRUNT_TFPATH ${lib.getBin terraform.full}/bin/terraform
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix b/pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix
deleted file mode 100644
index 5ea04d1f424eb..0000000000000
--- a/pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
-[
-  {
-    goPackagePath = "github.com/aws/aws-sdk-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/aws/aws-sdk-go";
-      rev = "952498f4a390118ac65ad59cbe0c8b57ed69b6b5";
-      sha256 = "03j2dn4v2wr32jd9iki68ra0r8aghy7hpad94bf8zdgsrjn6rwvj";
-    };
-  }
-  {
-    goPackagePath = "github.com/bgentry/go-netrc";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bgentry/go-netrc";
-      rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480";
-      sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-errors/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-errors/errors";
-      rev = "8fa88b06e5974e97fbf9899a7f86a344bfd1f105";
-      sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-getter";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-getter";
-      rev = "90b6568eac830f62a08e8f1f46375daa63e57015";
-      sha256 = "1cl0yqlhffjmf4qan093z49i88i7wjp9lsfwfzn52sk3c09ksism";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-version";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-version";
-      rev = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77";
-      sha256 = "0sjq57gpfznaqdrbyb2p0bn90g9h661cvr0jrk6ngags4pbw14ik";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/hcl";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/hcl";
-      rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
-      sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-zglob";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-zglob";
-      rev = "95345c4e1c0ebc9d16a3284177f09360f4d20fab";
-      sha256 = "012hrd67v4gp3b621rykg2kp6a7iq4dr585qavragbif0z1whckx";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/go-homedir";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-homedir";
-      rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
-      sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/go-testing-interface";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-testing-interface";
-      rev = "477c2d05a845d8b55912a5a7993b9b24abcc5ef8";
-      sha256 = "0llpcyiqfjdri7pba1p13maafgcyzjbd29h99b1hgj848k5avd61";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/mapstructure";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/mapstructure";
-      rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096";
-      sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86";
-    };
-  }
-  {
-    goPackagePath = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev = "4d4bfba8f1d1027c4fdbe371823030df51419987";
-      sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp";
-    };
-  }
-  {
-    goPackagePath = "github.com/urfave/cli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/urfave/cli";
-      rev = "d70f47eeca3afd795160003bc6e28b001d60c67c";
-      sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif";
-    };
-  }
-]
diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix
index 26cb9e40a2638..2d96d03361326 100644
--- a/pkgs/applications/networking/mailreaders/trojita/default.nix
+++ b/pkgs/applications/networking/mailreaders/trojita/default.nix
@@ -1,19 +1,19 @@
 { mkDerivation
 , lib
-, fetchgit
+, fetchurl
 , cmake
 , qtbase
 , qtwebkit
+, qttools
 }:
 
 mkDerivation rec {
   name = "trojita-${version}";
   version = "0.7";
 
-  src = fetchgit {
-    url = "https://anongit.kde.org/trojita.git";
-    rev = "065d527c63e8e4a3ca0df73994f848b52e14ed58";
-    sha256 = "1zlwhir33hha2p3l08wnb4njnfdg69j88ycf1fa4q3x86qm3r7hw";
+  src = fetchurl {
+    url = "mirror://sourceforge/trojita/trojita/${name}.tar.xz";
+    sha256 = "1n9n07md23ny6asyw0xpih37vlwzp7vawbkprl7a1bqwfa0si3g0";
   };
 
   buildInputs = [
@@ -23,6 +23,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
+    qttools
   ];
 
 
diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix
index b767f7d3b1d15..4408af7f45cce 100644
--- a/pkgs/applications/office/bookworm/default.nix
+++ b/pkgs/applications/office/bookworm/default.nix
@@ -3,23 +3,15 @@
 
 stdenv.mkDerivation rec {
   pname = "bookworm";
-  version = "unstable-2018-10-21";
+  version = "unstable-2018-11-19";
 
   src = fetchFromGitHub {
     owner = "babluboy";
     repo = pname;
-    rev = "4f7b118281667d22f1b3205edf0b775341fa49cb";
-    sha256 = "0bcyim87zk4b4xmgfs158lnds3y8jg7ppzw54kjpc9rh66fpn3b9";
+    rev = "4c3061784ff42151cac77d12bf2a28bf831fdfc5";
+    sha256 = "0yrqxa60xlvz249kx966z5krx8i7h17ac0hjgq9p8f0irzy5yp0n";
   };
 
-  # See: https://github.com/babluboy/bookworm/pull/220
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/worldofpeace/bookworm/commit/b2faf685c46b95d6a2d4ec3725e4e4122b61e99a.patch";
-      sha256 = "14az86cj5j65hngfflrp1rmnrkdrhg2a8pl7www3jgfwasxay975";
-    })
-  ];
-
   nativeBuildInputs = [
     bash
     gobjectIntrospection
diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix
index 358bfc380771e..85dfd024d5011 100644
--- a/pkgs/applications/office/planner/default.nix
+++ b/pkgs/applications/office/planner/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchgit
+, fetchFromGitLab
 , pkgconfig
 , intltool
 , automake111x
@@ -10,34 +10,36 @@
 , python
 }:
 
-let version = "20170425";
+let version = "unstable-2018-03-25";
 
 in stdenv.mkDerivation {
   name = "planner-${version}";
 
-  src = fetchgit {
-    url = https://gitlab.gnome.org/GNOME/planner.git;
-    rev = "6a79647e5711b2b8d7435cacc3452e643d2f05e6";
-    sha256 = "18k40s0f665qclrzvkgyfqmvjk0nqdc8aj3m8n4ky85di4qbqlwd";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "planner";
+    rev = "2a2bf11d96a7f5d64f05c9053661baa848e47797";
+    sha256 = "1bhh05kkbnhibldc1fc7kv7bwf8aa1vh4q379syqd3jbas8y521g";
   };
 
-  buildInputs = with gnome2; [
+  nativeBuildInputs = with gnome2; [
     pkgconfig
     intltool
     automake111x
     autoconf
     libtool
-
     gnome-common
     gtk-doc
+    scrollkeeper
+  ];
 
+  buildInputs = with gnome2; [
     GConf
     gtk
     libgnomecanvas
     libgnomeui
     libglade
-    scrollkeeper
-
     libxslt
     python
   ];
diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix
index f33152a8767c5..c77e0327fb6be 100644
--- a/pkgs/applications/science/logic/ltl2ba/default.nix
+++ b/pkgs/applications/science/logic/ltl2ba/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ltl2ba-${version}";
-  version = "1.2b1";
+  version = "1.2";
 
   src = fetchurl {
     url    = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${name}.tar.gz";
-    sha256 = "1f4jnkfkyj8lcc5qfqbiypfc11rhhpqqi6xs9xx5dysg6r6303wm";
+    sha256 = "0vzv5g7v87r41cvdafxi6yqnk7glzxrzgavy8213k59f6v11dzlx";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 7c8e62cc97ce6..9aff8e616c80a 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
 , zlib, libGLU_combined, libGLU, xorg }:
 
-let version = "4.0.4"; in
+let version = "4.0.5"; in
 
 stdenv.mkDerivation {
   name = "gmsh-${version}";
 
   src = fetchurl {
     url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
-    sha256 = "1hvrls3xyxvn69kwicpvndrs0zhifcfkhfsxr8zkmhmn6fhnjhha";
+    sha256 = "194354f5cfede4ef47cb6f1d2bde294873315a1b34be114564defef88d108adf";
   };
 
   buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index b25560c50c90f..cadd3c9fc68c7 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -4,17 +4,24 @@
 
 stdenv.mkDerivation rec {
   name = "makemkv-${ver}";
-  ver = "1.14.0";
+  ver = "1.14.1";
   builder = ./builder.sh;
 
+  # Using two URLs as the first one will break as soon as a new version is released
   src_bin = fetchurl {
-    url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
-    sha256 = "1xm5pww6jf3m704y7d7nc2ni2a6ygxwb2c665agg2i059sppwz1f";
+    urls = [
+      "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"
+      "http://www.makemkv.com/download/old/makemkv-bin-${ver}.tar.gz"
+    ];
+    sha256 = "1n4gjb1531gkvnjzipw63v3zdxmrq5nai9nn6m2ix3lskksjrrhp";
   };
 
   src_oss = fetchurl {
-    url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
-    sha256 = "1ihma2nv7zgqx1psgj3bdz723h94f4vk8mbahxl1v4v2rn9kg25z";
+    urls = [
+      "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"
+      "http://www.makemkv.com/download/old/makemkv-oss-${ver}.tar.gz"
+    ];
+    sha256 = "0ysb0nm11vp2ni838p5q3gqan5nrqbr7rz0h24j8p62827pib3pw";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/data/fonts/culmus/default.nix b/pkgs/data/fonts/culmus/default.nix
index 236058c0b2710..ee41d9b88fbdf 100644
--- a/pkgs/data/fonts/culmus/default.nix
+++ b/pkgs/data/fonts/culmus/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "0.130";
+  version = "0.133";
 in fetchzip {
   name = "culmus-${version}";
 
@@ -13,7 +13,7 @@ in fetchzip {
     cp -v *.ttf $out/share/fonts/truetype/
   '';
 
-  sha256 = "0v5vm8j2bxnw2qn0640kyibn4h8ck8cidhx2pixi5xsayr0ij1n6";
+  sha256 = "1jxg2wf4kwasp5cia00nki2lrcdnhsyh4yy7d05l0a9bim5hq2lr";
 
   meta = {
     description = "Culmus Hebrew fonts";
diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix
index 77c2ed4d780c2..aea809c04ecdb 100644
--- a/pkgs/data/fonts/font-awesome-5/default.nix
+++ b/pkgs/data/fonts/font-awesome-5/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "5.1.0";
+  version = "5.5.0";
 in fetchzip rec {
   name = "font-awesome-${version}";
 
@@ -14,7 +14,7 @@ in fetchzip rec {
     unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Solid-900.otf" -d $out/share/fonts/opentype
   '';
 
-  sha256 = "12m35bk61d8pddhybg2jpl5xv16dclz1qacdmk05m11nzshd3nz1";
+  sha256 = "1drjc40glfqhwmfn3s4gz8hz1x0ncrwdr9n1i25m1l7pvsk26f5f";
 
   meta = with stdenv.lib; {
     description = "Font Awesome - OTF font";
diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix
index 6876000d6e415..c408aae9c0efe 100644
--- a/pkgs/data/fonts/lmodern/default.nix
+++ b/pkgs/data/fonts/lmodern/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchzip }:
 
 fetchzip {
-  name = "lmodern-2.004.4";
+  name = "lmodern-2.004.5";
 
-  url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz;
+  url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.5.orig.tar.gz;
 
   postFetch = ''
     tar xzvf $downloadedFile
@@ -11,13 +11,13 @@ fetchzip {
     mkdir -p $out/texmf-dist/
     mkdir -p $out/share/fonts/
 
-    cp -r lmodern-2.004.4/* $out/texmf-dist/
-    cp -r lmodern-2.004.4/fonts/{opentype,type1} $out/share/fonts/
+    cp -r lmodern-2.004.5/* $out/texmf-dist/
+    cp -r lmodern-2.004.5/fonts/{opentype,type1} $out/share/fonts/
 
     ln -s -r $out/texmf* $out/share/
   '';
 
-  sha256 = "13n7ls8ss4sffd6c1iw2wb5hbq642i0fmivm76mbqwf652l002i5";
+  sha256 = "11f10qnp8a435lhh19zc2znlf9q4isynmvjmvr63g5n5fhvhc192";
 
   meta = {
     description = "Latin Modern font";
diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix
index 303c4db57dd16..d3970cf87108e 100644
--- a/pkgs/desktops/deepin/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/dde-session-ui/default.nix
@@ -6,13 +6,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dde-session-ui";
-  version = "4.6.1";
+  version = "4.6.2";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "190dgrwr5ji2bjndg2bmggpyccdz6pa3acx86yqmxfmirx669w92";
+    sha256 = "1fxlrj7vv7nqllwpwc8mxiv9bfqcj9b2qwkpjaq326pfmg5p5lhq";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index de5ac800747af..2c87180802bcc 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -7,13 +7,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "deepin-terminal";
-  version = "3.0.10";
+  version = "3.0.10.2";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "deepin-terminal";
     rev = version;
-    sha256 = "1jrzx0igq2csb25k4ak5hj81gpvb7zwbg4i64p4mln4vl7x27i5q";
+    sha256 = "0ylhp8q9kfdq9l69drawjaf0q8vcqyflb2a3zfnwbnf06dlpvkz6";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index dee1cc3d30856..3ecea2b54edbc 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -217,7 +217,7 @@ stdenv.mkDerivation (rec {
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
 
-  buildInputs = libDeps hostPlatform;
+  buildInputs = [ perl ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
     ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index 32a9095e12380..139457f43c8a4 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -190,7 +190,7 @@ stdenv.mkDerivation (rec {
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
 
-  buildInputs = libDeps hostPlatform;
+  buildInputs = [ perl ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
     ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index 73ddd3eab204a..911a900f6d23b 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -175,7 +175,7 @@ stdenv.mkDerivation (rec {
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
 
-  buildInputs = libDeps hostPlatform;
+  buildInputs = [ perl ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
     ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
diff --git a/pkgs/development/compilers/ghc/8.6.2.nix b/pkgs/development/compilers/ghc/8.6.2.nix
index f5e8ec6de0d6d..5e263fd06b435 100644
--- a/pkgs/development/compilers/ghc/8.6.2.nix
+++ b/pkgs/development/compilers/ghc/8.6.2.nix
@@ -175,7 +175,7 @@ stdenv.mkDerivation (rec {
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
 
-  buildInputs = libDeps hostPlatform;
+  buildInputs = [ perl ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
     ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index f85e68aafe42b..bd02daf5e1cfd 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -157,7 +157,7 @@ stdenv.mkDerivation (rec {
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
 
-  buildInputs = libDeps hostPlatform;
+  buildInputs = [ perl ] ++ (libDeps hostPlatform);
 
   propagatedBuildInputs = [ targetPackages.stdenv.cc ]
     ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index c427ec75cb37d..4d8b3f3981416 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.3.0";
+  version = "1.3.10";
 in stdenv.mkDerivation rec {
   inherit version;
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "14i5qmni1dzfamab6y659b5nvgp99m1abx71i83zcbfi9nw1r1gz";
+    sha256 = "0zf6p0pzdi6dz2d4dca364wf30zyq326xdfg97zk8kp1a4qwjyfa";
   };
 
   propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 948948ebc44e4..d26627ff5b9c3 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -21,42 +21,42 @@ let
     else
       throw "openjdk requires i686-linux or x86_64 linux";
 
-  update = "181";
-  build = "13";
+  update = "192";
+  build = "26";
   baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
   repover = "jdk8u${update}-b${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
   jdk8 = fetchurl {
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "0rlbf3v55d45fl9gigawghd0vs0cr3k48zj48qlv3k9yxg1knq9a";
+             sha256 = "1hx5sfsglc101aqs9n7cz7rh447d6rxfxkbw03crvzbvy9n6ag2d";
           };
   langtools = fetchurl {
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = "1sk5f45ndxj8ch9pqfwmis5hnb09an7nvz3n1wyd5la42jprmwaf";
+             sha256 = "0vq6nlzs85agjkilpr53v7kjrd99kq770zipqghjmlfzyiy9xk4q";
           };
   hotspot = fetchurl {
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = "0pvx5hwmx61sbyi02pngfbky219raqqjw2xjms01nz18mzr77c84";
+             sha256 = "0q5z2glfiip0lsisp1zy1zcw91hi1kznphm7w3iagq8s7550wbvh";
           };
   corba = fetchurl {
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = "1b0r3fjv9q85j74lgzr2vv4z5gl13bb46zvh36mfks6j74z7ki1z";
+             sha256 = "1mgg82066c9wjsj9ciqv4lrn1av5cb86hq00lkpsffdqbwx3vrm3";
           };
   jdk = fetchurl {
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = "1a5gm4w4f79wj0ciwcv8l8m4ha8hjs2r62bvj0vls2kwr5c8znn4";
+             sha256 = "1s87a49hl4h21kf2yh1w67wgb179j0f5v62cxbrvvd5lk2h5jyvf";
           };
   jaxws = fetchurl {
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = "1f92s3mpbqxzgh5pazqm8pn5swqkmdrkm7mnmga2kgshzlknh6pm";
+             sha256 = "05alcixcxcdms373byh21d2brsky6kj14b3h80cs9bi1gfnbqilq";
           };
   jaxp = fetchurl {
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = "0fwdqr031yyyjrpsk9fwp4y1vlfmdr1rdzgk44gyypwjdap7a11d";
+             sha256 = "1r3fqnl5jqmxzsjqjrka35f8hwqqap9jg8zwqk2vv9qikrm7frhl";
           };
   nashorn = fetchurl {
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = "0j5f98pa6746m1xq4842qq5d1ql5x8wvcrjmjk433slgma9hf8pj";
+             sha256 = "0lzwi35lp4a477jkmfa53kxy3g9lzcmh56wprg805gbv4sjnkjk1";
           };
   openjdk8 = stdenv.mkDerivation {
     name = "openjdk-8u${update}b${build}";
diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix
index e645a3424c0d0..0d5a892e2e963 100644
--- a/pkgs/development/coq-modules/bignums/default.nix
+++ b/pkgs/development/coq-modules/bignums/default.nix
@@ -1,6 +1,11 @@
 { stdenv, fetchFromGitHub, coq }:
 
 let params =
+  let v_8_8_0 = {
+      rev = "V8.8.0";
+      sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
+    };
+  in
   {
     "8.6" = {
       rev = "v8.6.0";
@@ -10,10 +15,8 @@ let params =
       rev = "V8.7.0";
       sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl";
     };
-    "8.8" = {
-      rev = "V8.8+beta1";
-      sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
-    };
+    "8.8" = v_8_8_0;
+    "8.9" = v_8_8_0;
   };
   param = params."${coq.coq-version}"
 ; in
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 690551a425589..a49064d16655c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -897,6 +897,7 @@ self: super: {
   cryptohash-md5 = doJailbreak super.cryptohash-md5;
   text-short = doJailbreak super.text-short;
   gitHUD = dontCheck super.gitHUD;
+  githud = dontCheck super.githud;
 
   # https://github.com/aisamanra/config-ini/issues/12
   config-ini = dontCheck super.config-ini;
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index 1dfd3476d4845..dccba8ebb0e42 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "groovy-${version}";
-  version = "2.5.3";
+  version = "2.5.4";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
-    sha256 = "1iw5iiygl0a7dzh22gkjhzzxd7r8kb4lncjvvgqfpxx967djp527";
+    sha256 = "1s661d5kwiafv5i1pq2b7k8b2fd7m2zp3xwcrf4iv1iik033djdj";
   };
 
   buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 81b71d721b843..330e6b282ce15 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
 jruby = stdenv.mkDerivation rec {
   name = "jruby-${version}";
 
-  version = "9.2.1.0";
+  version = "9.2.4.0";
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
-    sha256 = "0d98ydiavdr811xsrz9zbw9yjpn0acc2ycakqpfg1vs4n5w7764c";
+    sha256 = "034asndnqjgha74b6qr1gza9xfrmq9m8f6ysnblgd2axr218qqxr";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index fbe947e3afb15..6c535c3b51f3b 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, enableShared ? true }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }:
 
 stdenv.mkDerivation rec {
   version = "5.2.1";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "1cd8yq8va457iir1hlf17ksx11fx2hlb8i4jml8gj1875pizm0pk";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/fmtlib/fmt/commit/9d0c9c4bb145a286f725cd38c90331eee7addc7f.patch";
+      sha256 = "1gy93mb1s1mq746kxj4c564k2mppqp5khqdfa6im88rv29cvrl4y";
+    })
+  ];
+
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix
index 6892ea6364d71..ae2decb68accd 100644
--- a/pkgs/development/libraries/granite/default.nix
+++ b/pkgs/development/libraries/granite/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "granite";
-  version = "5.2.0";
+  version = "5.2.1";
 
   name = "${pname}-${version}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "1v1yhz6rp616xi417m9r8072s6mpz5i8vkdyj264b73p0lgjwh40";
+    sha256 = "18rw1lv6zk5w2cq8bv6b869z3cdikn9gzk30gw1s9f8n06bh737h";
   };
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix
index edb1dc01aa80b..db7dab1b6a7d4 100644
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/pkgs/development/libraries/hpx/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "hpx-${version}";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "STEllAR-GROUP";
     repo = "hpx";
     rev = "${version}";
-    sha256 = "0xlhnycmpy2jgiqyzpwmkdrl6drf46ywdsl0qm4vksvjxqfgk9z3";
+    sha256 = "1rliv42glns60bpmmvmgrglgmii42p8bmji349r6mr68f48iv4dx";
   };
 
   buildInputs = [ boost hwloc gperftools ];
diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix
deleted file mode 100644
index 880f91fccedc9..0000000000000
--- a/pkgs/development/libraries/isl/0.12.2.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, gmp }:
-
-stdenv.mkDerivation rec {
-  name = "isl-0.12.2"; # CLooG 0.16.3 fails to build with ISL 0.08.
-
-  src = fetchurl {
-    url = "http://isl.gforge.inria.fr/${name}.tar.bz2";
-    sha256 = "1d0zs64yw6fzs6b7kxq6nh9kvas16h8b43agwh30118jjzpdpczl";
-  };
-
-  buildInputs = [ gmp ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = https://www.kotnet.org/~skimo/isl/;
-    license = stdenv.lib.licenses.lgpl21;
-    description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/isl/0.15.0.nix b/pkgs/development/libraries/isl/0.20.0.nix
index 8b6080c2880a8..72ef581725b9a 100644
--- a/pkgs/development/libraries/isl/0.15.0.nix
+++ b/pkgs/development/libraries/isl/0.20.0.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "isl-0.15";
+  name = "isl-0.20";
 
   src = fetchurl {
     url = "http://isl.gforge.inria.fr/${name}.tar.xz";
-    sha256 = "1m922l5bz69lvkcxrib7lvjqwfqsr8rpbzgmb2aq07bp76460jhh";
+    sha256 = "1akpgq0rbqbah5517blg2zlnfvjxfcl9cjrfc75nbcx5p2gnlnd5";
   };
 
   buildInputs = [ gmp ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = https://www.kotnet.org/~skimo/isl/;
+    homepage = http://isl.gforge.inria.fr/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix
index 6947536fafb7f..1bc918af8352d 100644
--- a/pkgs/development/libraries/java/jflex/default.nix
+++ b/pkgs/development/libraries/java/jflex/default.nix
@@ -1,21 +1,31 @@
-{stdenv, fetchurl} :
+{stdenv, fetchurl, jre} :
 
 stdenv.mkDerivation rec {
-  name = "jflex-1.6.1";
+  name = "jflex-1.7.0";
 
   src = fetchurl {
-    url = "http://jflex.de/${name}.tar.gz";
-    sha256 = "1h7q2vhb4s42g4pqz5xxxliagprray7i9krr6hyaz1mjlx7gnycq";
+    url = "http://jflex.de/release/${name}.tar.gz";
+    sha256 = "1k7bqw1mn569g9dxc0ia3yz1bzgzs5w52lh1xn3hgj7k5ymh54kk";
   };
 
   sourceRoot = name;
 
-  phases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
+    runHook preInstall
     mkdir -p $out
     cp -a * $out
+    rm -f $out/bin/jflex.bat
+
     patchShebangs $out
+    sed -i -e '/^JAVA=java/ s#java#${jre}/bin/java#' $out/bin/jflex
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+    $out/bin/jflex --version
+    runHook postInstallCheck
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index f91fa192c034e..766c0dcf00edb 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "librealsense-${version}";
-  version = "2.16.1";
+  version = "2.16.4";
 
   src = fetchFromGitHub {
     owner = "IntelRealSense";
     repo = "librealsense";
     rev = "v${version}";
-    sha256 = "0vs2vcfmsb574bvdqrfgdmam0p631c738apk0w9mjdqk59zy1bz2";
+    sha256 = "0664lsdw9a3s3apqiv9kkzfnz86ai9wdc8y00qyxrmxq9lpjsq11";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix
index 6ca7b11321ba9..0ace54582ebcd 100644
--- a/pkgs/development/libraries/libversion/default.nix
+++ b/pkgs/development/libraries/libversion/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 let
-  version = "2.7.0";
+  version = "2.8.1";
 in
 stdenv.mkDerivation {
   name = "libversion-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     owner = "repology";
     repo = "libversion";
     rev = version;
-    sha256 = "0brk2mbazc7yz0h4zsvbybbaymf497dgxnc74qihnvbi4z4rlqpj";
+    sha256 = "0h0yfcgxll09dckzjb1im3yf54cjkpsflr7r4kwz1jcr3fxq41fz";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index b5188cb66d29c..849da2e6cad5f 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchurl, SDL, eigen, epoxy, fftw, gtest, pkgconfig }:
+{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "movit-${version}";
-  version = "1.5.1";
+  version = "1.6.2";
 
   src = fetchurl {
     url = "https://movit.sesse.net/${name}.tar.gz";
-    sha256 = "1259iq2ixiprk4mn7ypapinbg2w1sjq1aivzzbbch9i23kcfsd44";
+    sha256 = "1q9h086v6h3da4b9qyflcjx73cgnqjhb92rv6g4j90m34dndaa3l";
   };
 
   outputs = [ "out" "dev" ];
 
-  GTEST_DIR = "${gtest}";
+  GTEST_DIR = "${gtest.src}/googletest";
 
   propagatedBuildInputs = [ eigen epoxy ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ SDL fftw gtest ];
+  buildInputs = [ SDL2 fftw gtest ];
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "High-performance, high-quality video filters for the GPU";
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index cd3034e86122a..12d3c9ad94200 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null;
 
 stdenv.mkDerivation rec {
   name = "ntl-${version}";
-  version = "11.3.1";
+  version = "11.3.2";
 
   src = fetchurl {
     url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
-    sha256 = "08a1v92js13ij6lpf75xkjc8iy2w89igd7hy58abll6wnjj107zs";
+    sha256 = "17bfsvn72zjqfibnxscyf4hbk3inndh4r89jd2zg7mgqmd2k3fl4";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix
index c2d8f5e74c904..74e040e94ab02 100644
--- a/pkgs/development/libraries/protozero/default.nix
+++ b/pkgs/development/libraries/protozero/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "protozero-${version}";
-  version = "1.6.3";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "protozero";
     rev = "v${version}";
-    sha256 = "0lalk6hp7hqfn4fhhl2zb214idwm4y8dj32vi383arckzmsryhiw";
+    sha256 = "0hcawgyj3wxqikx5xqs1ag12w8vz00gb1rzx131jq51yhzc6bwrb";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix
index f57659de9a608..64122a4352736 100644
--- a/pkgs/development/node-packages/default-v10.nix
+++ b/pkgs/development/node-packages/default-v10.nix
@@ -68,10 +68,6 @@ nodePackages // {
     postInstall = "npm run-script prepublish";
   };
 
-  phantomjs = nodePackages.phantomjs.override {
-    buildInputs = [ pkgs.phantomjs2 ];
-  };
-
   pnpm = nodePackages.pnpm.override {
     nativeBuildInputs = [ pkgs.makeWrapper ];
     postInstall = let
diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index 645f75eb32364..7dc9649e6284e 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }:
 
 buildPythonPackage rec {
-  version = "4.10.0";
+  version = "4.11.0";
   pname = "breathe";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e94370b8b607a32d9611ed8246e635f02c21dc6847f04e888a00f66a12694eff";
+    sha256 = "05x3qrvsriy0cn0p4bxnzhp27pvxbq2vxlxncr2wqh003gpbp4fa";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];
diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix
index 90395b3b2a924..f224baeefbaec 100644
--- a/pkgs/development/python-modules/guessit/default.nix
+++ b/pkgs/development/python-modules/guessit/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "guessit";
-  version = "3.0.0";
+  version = "3.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bf17e78783cf13bf903750770de4c3bb6c9ca89baafedb1612794660b6ebe32b";
+    sha256 = "1q06b3k31bfb8cxjimpf1rkcrwnc596a9cppjw15minvdangl32r";
   };
 
   # Tests require more packages.
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 3d7a8abf4fe69..175114017f302 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "0.85.0";
+  version = "0.86.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "0kci017bl4ihq89zpwlgdlwzv7kili8146940kyar5v66kgf7xsh";
+    sha256 = "0sxg066bfkgqyq2fcjkff4jbhpxrzsqgz53h2b4wscxr076r9bjp";
   };
 
   installPhase = ''
diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix
new file mode 100644
index 0000000000000..4833755b3ee3e
--- /dev/null
+++ b/pkgs/development/tools/jid/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "jid-${version}";
+  version = "0.7.2";
+
+  goPackagePath = "github.com/simeji/jid";
+
+  src = fetchFromGitHub {
+    owner = "simeji";
+    repo = "jid";
+    rev = "${version}";
+    sha256 = "0p4srp85ilcafrn9d36rzpzg5k5jd7is93p68hamgxqyiiw6a8fi";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = {
+    description = "A command-line tool to incrementally drill down JSON";
+    homepage = https://github.com/simeji/jid;
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ stesie ];
+  };
+}
diff --git a/pkgs/development/tools/jid/deps.nix b/pkgs/development/tools/jid/deps.nix
new file mode 100644
index 0000000000000..a027902d2df2c
--- /dev/null
+++ b/pkgs/development/tools/jid/deps.nix
@@ -0,0 +1,57 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/bitly/go-simplejson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bitly/go-simplejson";
+      rev = "9db4a59bd4d803ae0c173a7d8a538e056cd59d57";
+      sha256 = "0cbnjzjq55jnzk07zdk7nb96yzgpyawm1r6km3xignn8ih4bnn6g";
+    };
+  }
+  {
+    goPackagePath = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e";
+      sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "c88d7e5f2e24de48a200a2655ac8a0910be9a0f7";
+      sha256 = "14prmzjlv9z31n6caaaq1kwi4p0mp3x4pv5r7d0575lcampa41jw";
+    };
+  }
+  {
+    goPackagePath = "github.com/nsf/termbox-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nsf/termbox-go";
+      rev = "60ab7e3d12ed91bc1b2486559c4b3a6b62297577";
+      sha256 = "040064fh7wzdmv8flw6svi007hiqs1cjk1a3k3gpg7gii3npifsl";
+    };
+  }
+  {
+    goPackagePath = "github.com/nwidger/jsoncolor";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nwidger/jsoncolor";
+      rev = "75a6de4340e59be95f0884b9cebdda246e0fdf40";
+      sha256 = "0aiv42xijrqgrxfx6pfyrndpwqv8i1qwsk190jdczyjxlnki2nki";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "059132a15dd08d6704c67711dae0cf35ab991756";
+      sha256 = "0bxkbh2rq40kdk8i05am5np77cnskx3571v2k300j5mmj1rl1ijg";
+    };
+  }
+]
diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix
index 5c6b8cfd9605b..66f1fff419021 100644
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   # On Linux, c-reduce's preferred way to reason about
   # the cpu architecture/topology is to use 'lscpu',
   # so let's make sure it knows where to find it:
-  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
+  postPatch = stdenv.lib.optionalString stdenv.isLinux ''
     substituteInPlace creduce/creduce_utils.pm --replace \
       lscpu ${utillinux}/bin/lscpu
   '';
diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix
index b041efefac772..23aeceb41a758 100644
--- a/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-index/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
 
-  version = "1.1.6";
+  version = "1.1.7";
   name = "ocaml${ocaml.version}-ocp-index-${version}";
 
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "ocp-index";
     rev = version;
-    sha256 = "0p367aphz9w71qbm3y47qwhgqmyai28l96i1ifb6kg7awph5qmj3";
+    sha256 = "0i50y033y78wcfgz3b81d34p98azahl94w4b63ac0zyczlwlhvkf";
   };
 
   buildInputs = [ ocaml findlib dune ocp-build cmdliner re ];
diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix
index 0af669ff0699a..47be5ff4250ee 100644
--- a/pkgs/development/web/now-cli/default.nix
+++ b/pkgs/development/web/now-cli/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchurl }:
 stdenv.mkDerivation rec {
   name = "now-cli-${version}";
-  version = "11.5.2";
+  version = "12.1.3";
 
   # TODO: switch to building from source, if possible
   src = fetchurl {
     url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz";
-    sha256 = "1aavhslff2v5ap11s3xxrmdgs4n9yyp74sj3kbw6kwxd4cq1cfxz";
+    sha256 = "0jg0x227g0x2fby7mnhfyrfyja59003isg7wyh2vqcfshh5hsaq0";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 78e4faf433c18..6ca22e261eea6 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,16 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "3.18";
+    version = "3.20";
     url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
-    sha256 = "0xqs76hxcym8nb95r7l72xx0msbscp7fhkr1wrv4r0923d5x9s4v";
+    sha256 = "063garmflbna3mhph8k0dv0bkzq8x75x5xrd0j8y0mjh10i13mik";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
-    # https://github.com/wine-compholio/wine-staging/releases
+    # https://github.com/wine-staging/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "18g1lmqzkc7ngppynimfvza1gkdhqlnjbvnckmaws847ns4i0kzp";
+    sha256 = "049cwllf4aybrhj4l2i3vd5jvagjz4d448404zkyy0lfxr08id3p";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";
diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/pkgs/misc/themes/equilux-theme/default.nix
index 42fe402a48608..21016eba844cf 100644
--- a/pkgs/misc/themes/equilux-theme/default.nix
+++ b/pkgs/misc/themes/equilux-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "equilux-theme-${version}";
-  version = "20180927";
+  version = "20181029";
 
   src = fetchFromGitHub {
     owner = "ddnexus";
     repo = "equilux-theme";
     rev = "equilux-v${version}";
-    sha256 = "1j7ykygmwv3dmzqdc9byir86sjz6ykhv9bv1pll1bjvvnaalyzgk";
+    sha256 = "0lv2yyxhnmnkwxp576wnb01id4fp734b5z5n0l67sg5z7vc2h8fc";
   };
 
   nativeBuildInputs = [ gnome3.glib libxml2 bc ];
diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix
index c486d8462ce69..e96e3ce895f38 100644
--- a/pkgs/misc/themes/materia-theme/default.nix
+++ b/pkgs/misc/themes/materia-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "materia-theme-${version}";
-  version = "20180928";
+  version = "20181115";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = "materia-theme";
     rev = "v${version}";
-    sha256 = "0v4mvc4rrf3jwf77spn9f5sqxp72v66k2k467r0aw3nglcpm4wpv";
+    sha256 = "1vfwzvzbs4336vjg6y4asm21p64xc5f7cfsld5l159174ikcz5fp";
   };
 
   nativeBuildInputs = [ gnome3.glib libxml2 bc ];
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
     sed -i install.sh \
       -e "s|if .*which gnome-shell.*;|if true;|" \
       -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}|"
-    mkdir -p $out/share/themes
     ./install.sh --dest $out/share/themes
     rm $out/share/themes/*/COPYING
   '';
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 0c30c92722c8d..3f1147aa80e99 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2871,6 +2871,16 @@
     };
   };
 
+  vim-ps1 = buildVimPluginFrom2Nix {
+    name = "vim-ps1-2017-10-20";
+    src = fetchFromGitHub {
+      owner = "PProvost";
+      repo = "vim-ps1";
+      rev = "0b2509f210f5dc73001fdcfe8fd7ac354b363388";
+      sha256 = "0fkqd9xnr0310pmi5hjxfwh9x6b75z6q1w8qp1alm4qcv425q9rm";
+    };
+  };
+
   vim-puppet = buildVimPluginFrom2Nix {
     name = "vim-puppet-2018-09-24";
     src = fetchFromGitHub {
@@ -3572,4 +3582,4 @@
       sha256 = "04pv7mmlz9ccgzfg8sycqxplaxpbyh7pmhwcw47b2xwnazjz49d6";
     };
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 113993cee737a..c369328c8d514 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -217,6 +217,7 @@ phanviet/vim-monokai-pro
 plasticboy/vim-markdown
 posva/vim-vue
 powerman/vim-plugin-AnsiEsc
+PProvost/vim-ps1
 python-mode/python-mode
 Quramy/tsuquyomi
 racer-rust/vim-racer
diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index fdb6ea3695e86..1645fbef49bc2 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libnl }:
 
 let
-  ver = "2018.3";
+  ver = "2018.4";
 in
 stdenv.mkDerivation rec {
   name = "batctl-${ver}";
 
   src = fetchurl {
     url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "1rljx2jlh3wlk6l9p068mhbqpdr5p5qnwm0336ay1316x0zjvqr4";
+    sha256 = "0mv2vlzcqfh5yavg2sqncca9iqgxi6llv83wwwsf3d38x2jjff74";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 9c8d445308753..36aafe9a4a215 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.20-rc2";
-  modDirVersion = "4.20.0-rc2";
+  version = "4.20-rc3";
+  modDirVersion = "4.20.0-rc3";
   extraMeta.branch = "4.20";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0vmzrsfdg8sjyq833szirsv83wj2lgd92hy1fw5rp7xnjavn69hc";
+    sha256 = "0iin34alr5ax15pvilhdn5pifqav4gkxalb7vqb8zvxnhsm6kk58";
   };
 
   # Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 13fc9ae376057..42e193a21ad4e 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -10,13 +10,13 @@ assert kernel != null;
 
 stdenv.mkDerivation rec {
   name = "spl-${version}-${kernel.version}";
-  version = "0.7.11";
+  version = "0.7.12";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "spl";
     rev = "spl-${version}";
-    sha256 = "15h02g5k3i20y2cycc72vr6hdn8n70jmzqii8dmx9za6bl9nk2rm";
+    sha256 = "13zqh1g132g63zv54l3bsg5kras9mllkx9wvlnfs13chfr7vpp4p";
   };
 
   patches = [ ./install_prefix.patch ];
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 237f3be8c413a..c66a5b37bb0ba 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -158,12 +158,12 @@ in {
   # to be adapted
   zfsStable = common {
     # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = "4.19";
+    # incompatibleKernelVersion = "4.19";
 
     # this package should point to the latest release.
-    version = "0.7.11";
+    version = "0.7.12";
 
-    sha256 = "0m9wkq6wf4cg8w38s3avd0bvybnv0avqwxk3gwz9rgb9rn0m98jg";
+    sha256 = "1j432nb3a86isghdysir9xi6l5djmb5fbc5s9zr0rwg4ziisskbh";
 
     extraPatches = [
       (fetchpatch {
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index 0f20128678ce5..dd84ae5732d03 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "neo4j-${version}";
-  version = "3.4.9";
+  version = "3.4.10";
 
   src = fetchurl {
     url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
-    sha256 = "0kg0dr42qi8cwg3i1hcgczd4psh97s54q5zd8z2wn1fqf4m2h597";
+    sha256 = "0wxcwsnnwk08w3zaz67aa93ysrl61lsy41xynq1sy6z31a7gx9jr";
   };
 
   buildInputs = [ makeWrapper jre8 which gawk ];
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index c86a108fc4257..6ae089ac1d96b 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -63,8 +63,8 @@ in rec {
   };
 
   ansible_2_7 = generic {
-    version = "2.7.1";
-    sha256  = "0fg95x2nr3j4rwnlyd2n03h91xx9fssi34c32356vk3z6ir395g7";
+    version = "2.7.2";
+    sha256  = "1q0yxba57m18rfpc3syvj7vyqsb35081h6s33qr6h0jf3r9pj3d0";
   };
 
   ansible2 = ansible_2_7;
diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix
new file mode 100644
index 0000000000000..99908f06b1017
--- /dev/null
+++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "dvd-vr-${version}";
+  version = "0.9.7";
+  src = fetchurl {
+    url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${version}.tar.gz";
+    sha256 = "13wkdia3c0ryda40b2nzpb9vddimasgc4w95hvl0k555k9k8bl0r";
+  };
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://www.pixelbeat.org/programs/dvd-vr/;
+    downloadPage = https://www.pixelbeat.org/programs/dvd-vr/;
+    description = "A utility to identify and optionally copy recordings from a DVD-VR format disc";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ fgaz ];
+  };
+}
+
diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix
index 61c6ab253cce9..7fb9ed3c97aee 100644
--- a/pkgs/tools/filesystems/f3/default.nix
+++ b/pkgs/tools/filesystems/f3/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "f3";
-  version = "7.0";
+  version = "7.1";
 
   enableParallelBuilding = true;
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "AltraMayor";
     repo = pname;
     rev = "v${version}";
-    sha256 = "195j2zd747ffbsl8p5rf7dyn1j5n05zfqy1s9fm4y6lz8yc1nr17";
+    sha256 = "0zglsmz683jg7f9wc6vmgljyg9w87pbnjw5x4w6x02w8233zvjqf";
   };
 
   buildInputs = [ parted udev ];
diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix
index 762368651d70b..1cbe48ecee54c 100644
--- a/pkgs/tools/filesystems/mtools/default.nix
+++ b/pkgs/tools/filesystems/mtools/default.nix
@@ -1,16 +1,17 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mtools-4.0.19";
+  name = "mtools-4.0.20";
 
   src = fetchurl {
     url = "mirror://gnu/mtools/${name}.tar.bz2";
-    sha256 = "1pqhv5l4fqj1d3698vajkccz65xqxs3991wpylbw7hm1kqcrgh8v";
+    sha256 = "1vcahr9s6zv1hnrx2bgjnzcas2y951q90r1jvvv4q9v5kwfd6qb0";
   };
 
   # Prevents errors such as "mainloop.c:89:15: error: expected ')'"
   # Upstream issue https://lists.gnu.org/archive/html/info-mtools/2014-02/msg00000.html
-  patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
+  patches = [ ./fix-dos_to_wchar-declaration.patch ] ++
+    stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
 
   # fails to find X on darwin
   configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x";
diff --git a/pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch b/pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch
new file mode 100644
index 0000000000000..576a14b1cb46d
--- /dev/null
+++ b/pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch
@@ -0,0 +1,11 @@
+--- mtools-4.0.20.org/charsetConv.c	2018-11-19 10:16:14.183820865 +0000
++++ mtools-4.0.20/charsetConv.c	2018-11-19 10:15:39.808451465 +0000
+@@ -266,7 +266,7 @@
+ 	free(cp);
+ }
+ 
+-int dos_to_wchar(doscp_t *cp, char *dos, wchar_t *wchar, size_t len)
++int dos_to_wchar(doscp_t *cp, const char *dos, wchar_t *wchar, size_t len)
+ {
+ 	int i;
+ 
diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix
index ea8cefd14d3ed..922d34e2d3663 100644
--- a/pkgs/tools/misc/bc/default.nix
+++ b/pkgs/tools/misc/bc/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     # Libraries for build
     buildPackages.readline buildPackages.ncurses
   ];
-  buildInputs = [ readline ];
+  buildInputs = [ readline flex ];
 
   doCheck = true; # not cross
 
diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index 0df351bdd5606..ee63924579718 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "jdupes-${version}";
-  version = "1.11";
+  version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "jbruchon";
     repo  = "jdupes";
     rev   = "v${version}";
-    sha256 = "124n9vgnqqhnwgnms7dqmndp25xrcjaykxrzbi4v4as98kxxi3j1";
+    sha256 = "1yg7071lwl561s7r0qrnfx45z3ny8gjfrxpx0dbyhv3ywiac5kw8";
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The testdir
     # directories have such files and will be removed.
diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index c65c59265b568..7dfc8e9d7ad83 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babeld-1.8.3";
+  name = "babeld-1.8.4";
 
   src = fetchurl {
     url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
-    sha256 = "1gb6fcvi1cyl05sr9zhhasqlcbi927sbc2dns1jbnyz029lcb31n";
+    sha256 = "11wbs1x17lr7jk2578zwy3cdwc6zhxwv97nnp13z14613320s1wq";
   };
 
   preBuild = ''
diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index dac3b616a9c8f..69b23b3e3a4c8 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -2,14 +2,14 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "http-prompt";
-  version = "0.11.2";
+  version = "1.0.0";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     repo = "http-prompt";
     owner = "eliangcs";
-    sha256 = "130w3wkb5jbiwm5w0b470nd50gf30vrknmf3knhlgdxdmfb30zjz";
+    sha256 = "0kngz2izcqjphbrdkg489p0xmf65xjc8ki1a2szcc8sgwc7z74xy";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index d0a81140fc83f..c20e3142104aa 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -17,6 +17,8 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl curl ]
     ++ stdenv.lib.optional stdenv.isDarwin Security;
 
+  doCheck = !stdenv.isDarwin;
+
   postInstall = ''
     mkdir -p $out/etc/profile.d
     cp ./command-not-found.sh $out/etc/profile.d/command-not-found.sh
diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix
index a5bf2d261e1c8..1ff804f0d4a47 100644
--- a/pkgs/tools/typesetting/scdoc/default.nix
+++ b/pkgs/tools/typesetting/scdoc/default.nix
@@ -2,15 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "scdoc-${version}";
-  version = "1.5.2";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz";
-    sha256 = "0a9sxifzsbj24kjnpc0525i91ni2vkwizhgvwx1m9shvfkiisnc6";
+    sha256 = "1ca3js4arkg28gg2iszxxyrq7kgsrz482d1szv5dfd471h3vr5m3";
   };
 
-  patches = [ ./use-source-date-epoch.patch ];
-
   postPatch = ''
     substituteInPlace Makefile \
       --replace "-static" "" \
diff --git a/pkgs/tools/typesetting/scdoc/use-source-date-epoch.patch b/pkgs/tools/typesetting/scdoc/use-source-date-epoch.patch
deleted file mode 100644
index 5a2496d635830..0000000000000
--- a/pkgs/tools/typesetting/scdoc/use-source-date-epoch.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/src/main.c b/src/main.c
-index 14b08d2..e2cc33e 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -3,6 +3,7 @@
- #include <stdbool.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#define __USE_XOPEN
- #include <time.h>
- #include <unistd.h>
- #include "string.h"
-@@ -66,10 +67,17 @@ static void parse_preamble(struct parser *p) {
- 	int section = -1;
- 	uint32_t ch;
- 	char date[256];
--	time_t now;
--	time(&now);
--	struct tm *now_tm = localtime(&now);
--	strftime(date, sizeof(date), "%F", now_tm);
-+	char *source_date_epoch = getenv("SOURCE_DATE_EPOCH");
-+	if (source_date_epoch != NULL) {
-+		struct tm source_date_epoch_tm;
-+		strptime(source_date_epoch, "%s", &source_date_epoch_tm);
-+		strftime(date, sizeof(date), "%F", &source_date_epoch_tm);
-+	} else {
-+		time_t now;
-+		time(&now);
-+		struct tm *now_tm = localtime(&now);
-+		strftime(date, sizeof(date), "%F", now_tm);
-+	}
- 	while ((ch = parser_getch(p)) != UTF8_INVALID) {
- 		if ((ch < 0x80 && isalnum(ch)) || ch == '_' || ch == '-' || ch == '.') {
- 			assert(str_append_ch(name, ch) != -1);
-diff --git a/test/preamble b/test/preamble
-index 03e2d0c..eeb734b 100755
---- a/test/preamble
-+++ b/test/preamble
-@@ -38,31 +38,31 @@ EOF
- end 0
- 
- begin "Writes the appropriate header"
--scdoc <<EOF | grep '^\.TH "test" "8" "'"$(date +'%F')"'"' >/dev/null
-+scdoc <<EOF | grep '^\.TH "test" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'"' >/dev/null
- test(8)
- EOF
- end 0
- 
- begin "Preserves dashes"
--scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F')"'"' >/dev/null
-+scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'"' >/dev/null
- test-manual(8)
- EOF
- end 0
- 
- begin "Handles extra footer field"
--scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F')"'" "Footer"' >/dev/null
-+scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'" "Footer"' >/dev/null
- test-manual(8) "Footer"
- EOF
- end 0
- 
- begin "Handles both extra fields"
--scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F')"'" "Footer" "Header"' >/dev/null
-+scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'" "Footer" "Header"' >/dev/null
- test-manual(8) "Footer" "Header"
- EOF
- end 0
- 
- begin "Emits empty footer correctly"
--scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F')"'" "" "Header"' >/dev/null
-+scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'" "" "Header"' >/dev/null
- test-manual(8) "" "Header"
- EOF
- end 0
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 5ddf15e09fad5..919c14d86ecf2 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonApplication rec {
   name = "google-compute-engine-${version}";
-  version = "20181011";
+  version = "20181023";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "compute-image-packages";
     rev = version;
-    sha256 = "1b3wyr412qh113xvs671dqnacidil61gisfvg79wbq6wrdwswkp8";
+    sha256 = "0bhh62f4kx4d7k673fvyzgr9h771lzk7dxhq3ld7zzcz0pmxlx3a";
   };
 
   postPatch = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a9db55f2a16b..81660a93d1e74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2347,6 +2347,8 @@ with pkgs;
 
   duply = callPackage ../tools/backup/duply { };
 
+  dvd-vr = callPackage ../tools/cd-dvd/dvd-vr { };
+
   dvdisaster = callPackage ../tools/cd-dvd/dvdisaster { };
 
   dvdplusrwtools = callPackage ../tools/cd-dvd/dvd+rw-tools { };
@@ -3480,12 +3482,11 @@ with pkgs;
 
   ised = callPackage ../tools/misc/ised {};
 
-  isl = isl_0_17;
+  isl = isl_0_20;
   isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { };
-  isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { };
   isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { };
-  isl_0_15 = callPackage ../development/libraries/isl/0.15.0.nix { };
   isl_0_17 = callPackage ../development/libraries/isl/0.17.1.nix { };
+  isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { };
 
   ispike = callPackage ../development/libraries/science/robotics/ispike { };
 
@@ -3513,6 +3514,8 @@ with pkgs;
 
   jhead = callPackage ../tools/graphics/jhead { };
 
+  jid = callPackage ../development/tools/jid { };
+
   jing = self.jing-trang;
   jing-trang = callPackage ../tools/text/xml/jing-trang { };
 
@@ -22570,18 +22573,15 @@ with pkgs;
   sqsh = callPackage ../development/tools/sqsh { };
 
   inherit (callPackage ../applications/networking/cluster/terraform {})
-    terraform_0_8_5
-    terraform_0_8
-    terraform_0_9
-    terraform_0_10
-    terraform_0_10-full
     terraform_0_11
     terraform_0_11-full
+    terraform_0_12
     terraform_plugins_test
     ;
 
   terraform = terraform_0_11;
-  terraform-full = terraform_0_11-full;
+  # deprecated
+  terraform-full = terraform.full;
 
   terraform-providers = recurseIntoAttrs (
     callPackage ../applications/networking/cluster/terraform-providers {}
@@ -22593,14 +22593,6 @@ with pkgs;
 
   terragrunt = callPackage ../applications/networking/cluster/terragrunt {};
 
-  terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix {
-    terraform = terraform_0_8;
-  };
-
-  terragrunt_0_9_8 = callPackage ../applications/networking/cluster/terragrunt/0.9.8.nix {
-    terraform = terraform_0_8_5;
-  };
-
   tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
 
   tetra-gtk-theme = callPackage ../misc/themes/tetra { };