puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Get rid of <figure>

Browse source
This commit is contained in:
Eelco Dolstra 2020-07-23 14:16:46 +02:00
parent ca130b73a0
commit 136fd55bb2
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
doc/manual/packages/profiles.xml
View file

@ -21,19 +21,16 @@ The long strings prefixed to the directory names are cryptographic
hashes<footnote><para>160-bit truncations of SHA-256 hashes encoded in hashes<footnote><para>160-bit truncations of SHA-256 hashes encoded in
a base-32 notation, to be precise.</para></footnote> of a base-32 notation, to be precise.</para></footnote> of
<emphasis>all</emphasis> inputs involved in building the package — <emphasis>all</emphasis> inputs involved in building the package —
sources, dependencies, compiler flags, and so on. So if two sources, dependencies, compiler flags, and so on. So if two packages
packages differ in any way, they end up in different locations in differ in any way, they end up in different locations in the file
the file system, so they don’t interfere with each other. <xref system, so they don’t interfere with each other. Here is what a part
linkend='fig-user-environments' /> shows a part of a typical Nix of a typical Nix store looks like:</para>
store.</para>
<figure xml:id='fig-user-environments'><title>User environments</title> <mediaobject>
<mediaobject> <imageobject>
<imageobject> <imagedata fileref='../figures/user-environments.png' format='PNG' />
<imagedata fileref='../figures/user-environments.png' format='PNG' /> </imageobject>
</imageobject> </mediaobject>
</mediaobject>
</figure>
<para>Of course, you wouldn’t want to type <para>Of course, you wouldn’t want to type
@ -50,10 +47,10 @@ uses is to create directory trees of symlinks to
<emphasis>user environments</emphasis> and they are packages <emphasis>user environments</emphasis> and they are packages
themselves (though automatically generated by themselves (though automatically generated by
<command>nix-env</command>), so they too reside in the Nix store. For <command>nix-env</command>), so they too reside in the Nix store. For
instance, in <xref linkend='fig-user-environments' /> the user instance, in the figure above, the user environment
environment <filename>/nix/store/0c1p5z4kda11...-user-env</filename> <filename>/nix/store/0c1p5z4kda11...-user-env</filename> contains a
contains a symlink to just Subversion 1.1.2 (arrows in the figure symlink to just Subversion 1.1.2 (arrows in the figure indicate
indicate symlinks). This would be what we would obtain if we had done symlinks). This would be what we would obtain if we had done
<screen> <screen>
$ nix-env -i subversion</screen> $ nix-env -i subversion</screen>

15
doc/manual/src/package-management/profiles.md
View file

@ -14,10 +14,10 @@ strings prefixed to the directory names are cryptographic hashes\[1\] of
*all* inputs involved in building the package — sources, dependencies, *all* inputs involved in building the package — sources, dependencies,
compiler flags, and so on. So if two packages differ in any way, they compiler flags, and so on. So if two packages differ in any way, they
end up in different locations in the file system, so they don’t end up in different locations in the file system, so they don’t
interfere with each other. [figure\_title](#fig-user-environments) shows interfere with each other. Here is what a part of a typical Nix store
a part of a typical Nix store. looks like:
![User environments](../figures/user-environments.png) ![](../figures/user-environments.png)
Of course, you wouldn’t want to type Of course, you wouldn’t want to type
@ -30,11 +30,10 @@ package we want to use, but this is not very convenient since changing
Nix uses is to create directory trees of symlinks to *activated* Nix uses is to create directory trees of symlinks to *activated*
packages. These are called *user environments* and they are packages packages. These are called *user environments* and they are packages
themselves (though automatically generated by `nix-env`), so they too themselves (though automatically generated by `nix-env`), so they too
reside in the Nix store. For instance, in reside in the Nix store. For instance, in the figure above, the user
[figure\_title](#fig-user-environments) the user environment environment `/nix/store/0c1p5z4kda11...-user-env` contains a symlink to
`/nix/store/0c1p5z4kda11...-user-env` contains a symlink to just just Subversion 1.1.2 (arrows in the figure indicate symlinks). This
Subversion 1.1.2 (arrows in the figure indicate symlinks). This would be would be what we would obtain if we had done
what we would obtain if we had done
$ nix-env -i subversion $ nix-env -i subversion