diff options
Diffstat (limited to 'doc/manual/quick-start.xml')
| -rw-r--r-- | doc/manual/quick-start.xml | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/doc/manual/quick-start.xml b/doc/manual/quick-start.xml index c4065ace199e..b51f2b167577 100644 --- a/doc/manual/quick-start.xml +++ b/doc/manual/quick-start.xml @@ -11,7 +11,7 @@ to the following chapters.</para> <orderedlist> <listitem><para>Download a source tarball or RPM from <link -xlink:href='http://www.cs.uu.nl/groups/ST/Trace/Nix'/>. Build source +xlink:href='http://nix.cs.uu.nl/'/>. Build source distributions using the regular sequence: <screen> @@ -22,8 +22,9 @@ $ make install <lineannotation>(as root)</lineannotation></screen> This will install Nix in <filename>/nix</filename>. You shouldn't change the prefix if at all possible since that will make it -impossible to use our pre-built components. Alternatively, you could -grab an RPM if you're on an RPM-based system. You should also add +impossible to use pre-built binaries from the Nixpkgs channel and +other channels. Alternatively, you could grab an RPM if you're on an +RPM-based system. You should also add <filename>/nix/etc/profile.d/nix.sh</filename> to your <filename>~/.bashrc</filename> (or some other login file).</para></listitem> @@ -40,14 +41,14 @@ $ nix-channel --add \ <screen> $ nix-channel --update</screen> -Note that this in itself doesn't download any components, it just +Note that this in itself doesn't download any packages, it just downloads the Nix expressions that build them and stores them somewhere (under <filename>~/.nix-defexpr</filename>, in case you're curious). Also, it registers the fact that pre-built binaries are available remotely.</para></listitem> -<listitem><para>See what installable components are currently -available in the channel: +<listitem><para>See what installable packages are currently available +in the channel: <screen> $ nix-env -qa ’*’ <lineannotation>(mind the quotes!)</lineannotation> @@ -59,13 +60,13 @@ libxslt-1.1.0 </para></listitem> -<listitem><para>Install some components from the channel: +<listitem><para>Install some packages from the channel: <screen> $ nix-env -i hello firefox <replaceable>...</replaceable> </screen> -This should download the pre-built components; it should not build -them locally (if it does, something went wrong).</para></listitem> +This should download pre-built packages; it should not build them +locally (if it does, something went wrong).</para></listitem> <listitem><para>Test that they work: @@ -92,8 +93,8 @@ $ nix-env -e hello</screen> $ nix-channel --update $ nix-env -u '*'</screen> -The latter command will upgrade each installed component for which -there is a “newer” version (as determined by comparing the version +The latter command will upgrade each installed package for which there +is a “newer” version (as determined by comparing the version numbers).</para></listitem> <listitem><para>You can also install specific packages directly from @@ -107,7 +108,7 @@ appear asking you whether it’s okay to install the package. Say installed.</para></listitem> <listitem><para>If you're unhappy with the result of a -<command>nix-env</command> action (e.g., an upgraded component turned +<command>nix-env</command> action (e.g., an upgraded package turned out not to work properly), you can go back: <screen> @@ -124,7 +125,7 @@ $ nix-collect-garbage -d</screen> <!-- The first command deletes old “generations” of your profile (making -rollbacks impossible, but also making the components in those old +rollbacks impossible, but also making the packages in those old generations available for garbage collection), while the second command actually deletes them.--> |