guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

197/376: Remove unhelpful suggestion


From: Ludovic Courtès
Subject: 197/376: Remove unhelpful suggestion
Date: Wed, 28 Jan 2015 22:04:59 +0000

civodul pushed a commit to tag 1.8
in repository guix.

commit a2fc9c6b57ff64d535eef555d2260a81c19e2a2b
Author: Eelco Dolstra <address@hidden>
Date:   Tue Sep 16 15:42:20 2014 +0200

    Remove unhelpful suggestion
---
 doc/manual/troubleshooting/collisions-nixenv.xml |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/doc/manual/troubleshooting/collisions-nixenv.xml 
b/doc/manual/troubleshooting/collisions-nixenv.xml
index 316d2d1..23cc43f 100644
--- a/doc/manual/troubleshooting/collisions-nixenv.xml
+++ b/doc/manual/troubleshooting/collisions-nixenv.xml
@@ -33,11 +33,6 @@ environment (if already installed) using <command>nix-env
 -e</command>, or specify exactly which version should be installed
 (e.g., <literal>nix-env -i docbook-xml-4.2</literal>).</para>
 
-<para>Alternatively, you can modify the user environment builder
-script (in
-<filename><replaceable>prefix</replaceable>/share/nix/corepkgs/buildenv/builder.pl</filename>)
-to implement some conflict resolution policy.  E.g., the script could
-be modified to rename conflicting file names, or to pick one over the
-other.</para>
+<!-- FIXME: describe priorities -->
 
 </section>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]