From 7d2dbbd3aa6166927b6c5ad38ab19c4c4e810433 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 2 Jun 2025 09:21:34 -0400 Subject: [PATCH] =?UTF-8?q?Rename=20=CE=B5=20to=20"(no=20version)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/manual/source/glossary.md | 4 ---- src/nix/diff-closures.cc | 2 +- src/nix/diff-closures.md | 2 +- tests/functional/nix-profile.sh | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/doc/manual/source/glossary.md b/doc/manual/source/glossary.md index 94a6b5825..592317c12 100644 --- a/doc/manual/source/glossary.md +++ b/doc/manual/source/glossary.md @@ -347,10 +347,6 @@ The empty set symbol. In the context of profile history, this denotes a package is not present in a particular version of the profile. -- [`ε`]{#gloss-epsilon} - - The epsilon symbol. In the context of a package, this means the version is empty. More precisely, the derivation does not have a version attribute. - - [package]{#package} A software package; files that belong together for a particular purpose, and metadata. diff --git a/src/nix/diff-closures.cc b/src/nix/diff-closures.cc index ff9f9db40..984190391 100644 --- a/src/nix/diff-closures.cc +++ b/src/nix/diff-closures.cc @@ -52,7 +52,7 @@ std::string showVersions(const StringSet & versions) if (versions.empty()) return "∅"; StringSet versions2; for (auto & version : versions) - versions2.insert(version.empty() ? "ε" : version); + versions2.insert(version.empty() ? "(no version)" : version); return concatStringsSep(", ", versions2); } diff --git a/src/nix/diff-closures.md b/src/nix/diff-closures.md index 0294c0d8d..dfacb6ab0 100644 --- a/src/nix/diff-closures.md +++ b/src/nix/diff-closures.md @@ -36,7 +36,7 @@ No size change is shown if it's below the threshold. If the package does not exist in either the *before* or *after* closures, it is represented using `∅` (empty set) on the appropriate side of the arrow. If a package has an empty version string, the version is -rendered as `ε` (epsilon). +rendered as `(no version)`. There may be multiple versions of a package in each closure. In that case, only the changed versions are shown. Thus, diff --git a/tests/functional/nix-profile.sh b/tests/functional/nix-profile.sh index b1cfef6b0..dc56752ee 100755 --- a/tests/functional/nix-profile.sh +++ b/tests/functional/nix-profile.sh @@ -59,7 +59,7 @@ nix profile list | grep -A4 'Name:.*flake1' | grep 'Locked flake URL:.*narHash' (! [ -e $TEST_HOME/.nix-profile/include ]) nix profile history nix profile history | grep "packages.$system.default: ∅ -> 1.0" -nix profile diff-closures | grep 'env-manifest.nix: ε → ∅' +nix profile diff-closures | grep 'env-manifest.nix: (no version) → ∅' # Test XDG Base Directories support export NIX_CONFIG="use-xdg-base-directories = true"