aboutsummaryrefslogtreecommitdiff
path: root/src/nix
diff options
context:
space:
mode:
Diffstat (limited to 'src/nix')
-rw-r--r--src/nix/profile-list.md9
-rw-r--r--src/nix/profile-remove.md11
-rw-r--r--src/nix/profile-upgrade.md11
-rw-r--r--src/nix/profile.cc156
4 files changed, 129 insertions, 58 deletions
diff --git a/src/nix/profile-list.md b/src/nix/profile-list.md
index 5d7fcc0ec..d807a69c6 100644
--- a/src/nix/profile-list.md
+++ b/src/nix/profile-list.md
@@ -6,6 +6,7 @@ R""(
```console
# nix profile list
+ Name: gdb
Index: 0
Flake attribute: legacyPackages.x86_64-linux.gdb
Original flake URL: flake:nixpkgs
@@ -13,6 +14,7 @@ R""(
Store paths: /nix/store/indzcw5wvlhx6vwk7k4iq29q15chvr3d-gdb-11.1
Index: 1
+ Name: blender-bin
Flake attribute: packages.x86_64-linux.default
Original flake URL: flake:blender-bin
Locked flake URL: github:edolstra/nix-warez/91f2ffee657bf834e4475865ae336e2379282d34?dir=blender
@@ -26,7 +28,7 @@ R""(
# nix build github:edolstra/nix-warez/91f2ffee657bf834e4475865ae336e2379282d34?dir=blender#packages.x86_64-linux.default
```
- will build the package with index 1 shown above.
+ will build the package with name blender-bin shown above.
# Description
@@ -34,10 +36,13 @@ This command shows what packages are currently installed in a
profile. For each installed package, it shows the following
information:
-* `Index`: An integer that can be used to unambiguously identify the
+* `Name`: A unique name used to unambiguously identify the
package in invocations of `nix profile remove` and `nix profile
upgrade`.
+* `Index`: An integer that can be used to unambiguously identify the package in invocations of `nix profile remove` and `nix profile upgrade`.
+ (*Deprecated, will be removed in a future version in favor of `Name`.*)
+
* `Flake attribute`: The flake output attribute path that provides the
package (e.g. `packages.x86_64-linux.hello`).
diff --git a/src/nix/profile-remove.md b/src/nix/profile-remove.md
index ba85441d8..c76f4b09c 100644
--- a/src/nix/profile-remove.md
+++ b/src/nix/profile-remove.md
@@ -2,10 +2,17 @@ R""(
# Examples
-* Remove a package by position:
+* Remove a package by name:
```console
- # nix profile remove 3
+ # nix profile remove hello
+ ```
+
+* Remove a package by index
+ *(deprecated, will be removed in a future version)*:
+
+ ```console
+ $ nix profile remove 3
```
* Remove a package by attribute path:
diff --git a/src/nix/profile-upgrade.md b/src/nix/profile-upgrade.md
index 39cca428b..b13cb66bb 100644
--- a/src/nix/profile-upgrade.md
+++ b/src/nix/profile-upgrade.md
@@ -9,18 +9,19 @@ R""(
# nix profile upgrade '.*'
```
-* Upgrade a specific package:
+* Upgrade a specific package by name:
+
+ ```console
+ # nix profile upgrade hello
+ ```
```console
# nix profile upgrade packages.x86_64-linux.hello
```
-* Upgrade a specific profile element by number:
+* Upgrade a specific package by index:
```console
- # nix profile list
- 0 flake:nixpkgs#legacyPackages.x86_64-linux.spotify …
-
# nix profile upgrade 0
```
diff --git a/src/nix/profile.cc b/src/nix/profile.cc
index 67f97ca9b..f702c7c06 100644
--- a/src/nix/profile.cc
+++ b/src/nix/profile.cc
@@ -189,13 +189,24 @@ public:
{
std::vector<Matcher> res;
+ auto anyIndexMatchers = false;
+
for (auto & s : _matchers) {
- if (auto n = string2Int<size_t>(s))
+ if (auto n = string2Int<size_t>(s)) {
res.push_back(*n);
- else if (store->isStorePath(s))
+ anyIndexMatchers = true;
+ } else if (store->isStorePath(s)) {
res.push_back(s);
- else
+ } else {
res.push_back(RegexPattern{s,std::regex(s, std::regex::extended | std::regex::icase)});
+ }
+ }
+
+ if (anyIndexMatchers) {
+ warn(
+ "Indices are deprecated and be removed in a future version!\n"
+ " Refer to packages by their `Name` printed by `nix profile list`.\n"
+ );
}
return res;
@@ -206,12 +217,13 @@ public:
for (auto & matcher : matchers) {
if (auto n = std::get_if<size_t>(&matcher)) {
if (*n == pos) return true;
+
} else if (auto path = std::get_if<Path>(&matcher)) {
if (element.storePaths.count(store.parseStorePath(*path))) return true;
} else if (auto regex = std::get_if<RegexPattern>(&matcher)) {
- if (element.source
- && std::regex_match(element.source->attrPath, regex->reg))
+ if (std::regex_match(element.name, regex->reg)) {
return true;
+ }
}
}
@@ -294,62 +306,100 @@ struct CmdProfileUpgrade : virtual SourceExprCommand, MixDefaultProfile, MixProf
Installables installables;
std::vector<size_t> indices;
+ auto matchedCount = 0;
auto upgradedCount = 0;
for (size_t i = 0; i < manifest.elements.size(); ++i) {
auto & element(manifest.elements[i]);
- if (element.source
- && !element.source->originalRef.input.isLocked()
- && matches(*store, element, i, matchers))
- {
- upgradedCount++;
+ if (!matches(*store, element, i, matchers)) {
+ continue;
+ }
- Activity act(*logger, lvlChatty, actUnknown,
- fmt("checking '%s' for updates", element.source->attrPath));
+ matchedCount += 1;
- auto installable = make_ref<InstallableFlake>(
- this,
- getEvalState(),
- FlakeRef(element.source->originalRef),
- "",
- element.source->outputs,
- Strings{element.source->attrPath},
- Strings{},
- lockFlags);
+ if (!element.source) {
+ warn(
+ "Found package '%s', but it was not installed from a flake, so it can't be checked for upgrades",
+ element.identifier()
+ );
+ continue;
+ }
- auto derivedPaths = installable->toDerivedPaths();
- if (derivedPaths.empty()) continue;
- auto * infop = dynamic_cast<ExtraPathInfoFlake *>(&*derivedPaths[0].info);
- // `InstallableFlake` should use `ExtraPathInfoFlake`.
- assert(infop);
- auto & info = *infop;
+ if (element.source->originalRef.input.isLocked()) {
+ warn(
+ "Found package '%s', but it was installed from a locked flake reference so it can't be upgraded",
+ element.identifier()
+ );
+ continue;
+ }
- if (element.source->lockedRef == info.flake.lockedRef) continue;
+ upgradedCount++;
- printInfo("upgrading '%s' from flake '%s' to '%s'",
- element.source->attrPath, element.source->lockedRef, info.flake.lockedRef);
+ Activity act(
+ *logger,
+ lvlChatty,
+ actUnknown,
+ fmt("checking '%s' for updates", element.source->attrPath),
+ Logger::Fields{element.source->attrPath}
+ );
- element.source = ProfileElementSource {
- .originalRef = installable->flakeRef,
- .lockedRef = info.flake.lockedRef,
- .attrPath = info.value.attrPath,
- .outputs = installable->extendedOutputsSpec,
- };
+ auto installable = make_ref<InstallableFlake>(
+ this,
+ getEvalState(),
+ FlakeRef(element.source->originalRef),
+ "",
+ element.source->outputs,
+ Strings{element.source->attrPath},
+ Strings{},
+ lockFlags
+ );
- installables.push_back(installable);
- indices.push_back(i);
+ auto derivedPaths = installable->toDerivedPaths();
+ if (derivedPaths.empty()) {
+ continue;
}
+
+ auto * infop = dynamic_cast<ExtraPathInfoFlake *>(&*derivedPaths[0].info);
+ // `InstallableFlake` should use `ExtraPathInfoFlake`.
+ assert(infop);
+ auto & info = *infop;
+
+ if (element.source->lockedRef == info.flake.lockedRef) {
+ continue;
+ }
+
+ printInfo(
+ "upgrading '%s' from flake '%s' to '%s'",
+ element.source->attrPath,
+ element.source->lockedRef,
+ info.flake.lockedRef
+ );
+
+ element.source = ProfileElementSource {
+ .originalRef = installable->flakeRef,
+ .lockedRef = info.flake.lockedRef,
+ .attrPath = info.value.attrPath,
+ .outputs = installable->extendedOutputsSpec,
+ };
+
+ installables.push_back(installable);
+ indices.push_back(i);
+
}
if (upgradedCount == 0) {
- for (auto & matcher : matchers) {
- if (const size_t * index = std::get_if<size_t>(&matcher)){
- warn("'%d' is not a valid index", *index);
- } else if (const Path * path = std::get_if<Path>(&matcher)){
- warn("'%s' does not match any paths", *path);
- } else if (const RegexPattern * regex = std::get_if<RegexPattern>(&matcher)){
- warn("'%s' does not match any packages", regex->pattern);
+ if (matchedCount == 0) {
+ for (auto & matcher : matchers) {
+ if (const size_t * index = std::get_if<size_t>(&matcher)){
+ warn("'%d' is not a valid index", *index);
+ } else if (const Path * path = std::get_if<Path>(&matcher)){
+ warn("'%s' does not match any paths", *path);
+ } else if (const RegexPattern * regex = std::get_if<RegexPattern>(&matcher)){
+ warn("'%s' does not match any packages", regex->pattern);
+ }
}
+ } else {
+ warn("Found some packages but none of them could be upgraded");
}
warn ("Use 'nix profile list' to see the current profile.");
}
@@ -394,10 +444,18 @@ struct CmdProfileList : virtual EvalCommand, virtual StoreCommand, MixDefaultPro
} else {
for (size_t i = 0; i < manifest.elements.size(); ++i) {
auto & element(manifest.elements[i]);
- if (i) logger->cout("");
- logger->cout("Index: " ANSI_BOLD "%s" ANSI_NORMAL "%s",
- i,
- element.active ? "" : " " ANSI_RED "(inactive)" ANSI_NORMAL);
+ if (i) {
+ logger->cout("");
+ }
+ logger->cout(
+ "Name: " ANSI_BOLD "%s" ANSI_NORMAL "%s",
+ element.name,
+ element.active ? "" : " " ANSI_RED "(inactive)" ANSI_NORMAL
+ );
+ logger->cout(
+ "Index: " ANSI_BOLD "%s" ANSI_NORMAL "%S",
+ i
+ );
if (element.source) {
logger->cout("Flake attribute: %s%s", element.source->attrPath, element.source->outputs.to_string());
logger->cout("Original flake URL: %s", element.source->originalRef.to_string());
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 10:00:13 +0000