Merge master into staging-next

2018-11-12 18:59:08 +01:00
parent 917400bcff 968b20e2c7
commit daf3297cb4
141 changed files with 1835 additions and 779 deletions
@@ -67,9 +67,9 @@ buildDunePackage rec {

 <para>
   Here is a second example, this time using a source archive generated with
-   <literal>dune-release</literal>. The <literal>unpackCmd</literal>
-   redefinition is necessary to be able to unpack the kind of tarball that
-   <literal>dune-release</literal> generates. This library does not depend
+   <literal>dune-release</literal>. It is a good idea to use this archive when
+   it is available as it will usually contain substituted variables such as a
+   <literal>%%VERSION%%</literal> field. This library does not depend
   on any other OCaml library and no tests are run after building it.
 </para>

@@ -87,8 +87,6 @@ buildDunePackage rec {
    sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq";
  };

-  unpackCmd = "tar xjf $src";
-
  meta = with stdenv.lib; {
    homepage = https://github.com/flowtype/ocaml-wtf8;
    description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";