summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-10-08 11:56:52 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-10-08 11:56:52 +0200
commita0c34f54cc61dc20ae1ec91766b9efad102f5b36 (patch)
tree96aeb2b4fb3aeff9ecc8c52d173c3b8d57a0ce59 /doc
parent0913e30c859f0071d0f0529c309d4256713acc41 (diff)
parent60b2fe660e2bcb605650173b7b0a59a47bc6a7e5 (diff)
downloadnixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar
nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.gz
nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.bz2
nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.lz
nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.xz
nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.zst
nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.zip
Merge master into staging-next
Diffstat (limited to 'doc')
-rw-r--r--doc/languages-frameworks/beam.xml15
1 files changed, 1 insertions, 14 deletions
diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml
index 65f28d0a2d3..74c595cc89b 100644
--- a/doc/languages-frameworks/beam.xml
+++ b/doc/languages-frameworks/beam.xml
@@ -55,20 +55,7 @@
    <title>Rebar3</title>
 
    <para>
-    By default, Rebar3 wants to manage its own dependencies. This is perfectly acceptable in the normal, non-Nix setup, but in the Nix world, it is not. To rectify this, we provide two versions of Rebar3:
-    <itemizedlist>
-     <listitem>
-      <para>
-       <literal>rebar3</literal>: patched to remove the ability to download anything. When not running it via <literal>nix-shell</literal> or <literal>nix-build</literal>, it's probably not going to work as desired.
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       <literal>rebar3-open</literal>: the normal, unmodified Rebar3. It should work exactly as would any other version of Rebar3. Any Erlang package should rely on <literal>rebar3</literal> instead. See <xref
-            linkend="rebar3-packages"/>.
-      </para>
-     </listitem>
-    </itemizedlist>
+    We provide a version of Rebar3, which is the normal, unmodified Rebar3, under <literal>rebar3</literal>. We also provide a helper to fetch Rebar3 dependencies from a lockfile under <literal>fetchRebar3Deps</literal>.
    </para>
   </section>