From 136fd55bb2f7c4f8e93992c6b662d54ce941a73a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 23 Jul 2020 14:16:46 +0200 Subject: [PATCH] Get rid of
--- doc/manual/packages/profiles.xml | 29 +++++++++---------- doc/manual/src/package-management/profiles.md | 15 +++++----- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/doc/manual/packages/profiles.xml b/doc/manual/packages/profiles.xml index 15085ab58..2809def24 100644 --- a/doc/manual/packages/profiles.xml +++ b/doc/manual/packages/profiles.xml @@ -21,19 +21,16 @@ The long strings prefixed to the directory names are cryptographic hashes160-bit truncations of SHA-256 hashes encoded in a base-32 notation, to be precise. of all inputs involved in building the package — -sources, dependencies, 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 interfere with each other. shows a part of a typical Nix -store. +sources, dependencies, 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 interfere with each other. Here is what a part +of a typical Nix store looks like: -
User environments - - - - - -
+ + + + + Of course, you wouldn’t want to type @@ -50,10 +47,10 @@ uses is to create directory trees of symlinks to user environments and they are packages themselves (though automatically generated by nix-env), so they too reside in the Nix store. For -instance, in the user -environment /nix/store/0c1p5z4kda11...-user-env -contains a symlink to just Subversion 1.1.2 (arrows in the figure -indicate symlinks). This would be what we would obtain if we had done +instance, in the figure above, the user environment +/nix/store/0c1p5z4kda11...-user-env contains a +symlink to just Subversion 1.1.2 (arrows in the figure indicate +symlinks). This would be what we would obtain if we had done $ nix-env -i subversion diff --git a/doc/manual/src/package-management/profiles.md b/doc/manual/src/package-management/profiles.md index 984afca55..9076033d7 100644 --- a/doc/manual/src/package-management/profiles.md +++ b/doc/manual/src/package-management/profiles.md @@ -14,10 +14,10 @@ strings prefixed to the directory names are cryptographic hashes\[1\] of *all* inputs involved in building the package — sources, dependencies, 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 -interfere with each other. [figure\_title](#fig-user-environments) shows -a part of a typical Nix store. +interfere with each other. Here is what 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 @@ -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* packages. These are called *user environments* and they are packages themselves (though automatically generated by `nix-env`), so they too -reside in the Nix store. For instance, in -[figure\_title](#fig-user-environments) the user environment -`/nix/store/0c1p5z4kda11...-user-env` contains a symlink to just -Subversion 1.1.2 (arrows in the figure indicate symlinks). This would be -what we would obtain if we had done +reside in the Nix store. For instance, in the figure above, the user +environment `/nix/store/0c1p5z4kda11...-user-env` contains a symlink to +just Subversion 1.1.2 (arrows in the figure indicate symlinks). This +would be what we would obtain if we had done $ nix-env -i subversion