max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-10 08:16:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10060 from bobvanderlinden/pr-simple-profile-remove-suggestion

Browse source 
profile: suggest removal using profile entry name
This commit is contained in:
Eelco Dolstra 2024-02-22 11:02:12 +01:00 committed by GitHub
commit f183eef4a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nix/profile.cc
View file

@ -400,13 +400,13 @@ struct CmdProfileInstall : InstallablesCommand, MixDefaultProfile
// See https://github.com/NixOS/nix/compare/3efa476c5439f8f6c1968a6ba20a31d1239c2f04..1fe5d172ece51a619e879c4b86f603d9495cc102 // See https://github.com/NixOS/nix/compare/3efa476c5439f8f6c1968a6ba20a31d1239c2f04..1fe5d172ece51a619e879c4b86f603d9495cc102
auto findRefByFilePath = [&]<typename Iterator>(Iterator begin, Iterator end) { auto findRefByFilePath = [&]<typename Iterator>(Iterator begin, Iterator end) {
for (auto it = begin; it != end; it++) { for (auto it = begin; it != end; it++) {
auto & profileElement = it->second; auto & [name, profileElement] = *it;
for (auto & storePath : profileElement.storePaths) { for (auto & storePath : profileElement.storePaths) {
if (conflictError.fileA.starts_with(store->printStorePath(storePath))) { if (conflictError.fileA.starts_with(store->printStorePath(storePath))) {
return std::pair(conflictError.fileA, profileElement.toInstallables(*store)); return std::tuple(conflictError.fileA, name, profileElement.toInstallables(*store));
} }
if (conflictError.fileB.starts_with(store->printStorePath(storePath))) { if (conflictError.fileB.starts_with(store->printStorePath(storePath))) {
return std::pair(conflictError.fileB, profileElement.toInstallables(*store)); return std::tuple(conflictError.fileB, name, profileElement.toInstallables(*store));
} }
} }
} }
@ -415,9 +415,9 @@ struct CmdProfileInstall : InstallablesCommand, MixDefaultProfile
// There are 2 conflicting files. We need to find out which one is from the already installed package and // There are 2 conflicting files. We need to find out which one is from the already installed package and
// which one is the package that is the new package that is being installed. // which one is the package that is the new package that is being installed.
// The first matching package is the one that was already installed (original). // The first matching package is the one that was already installed (original).
auto [originalConflictingFilePath, originalConflictingRefs] = findRefByFilePath(manifest.elements.begin(), manifest.elements.end()); auto [originalConflictingFilePath, originalEntryName, originalConflictingRefs] = findRefByFilePath(manifest.elements.begin(), manifest.elements.end());
// The last matching package is the one that was going to be installed (new). // The last matching package is the one that was going to be installed (new).
auto [newConflictingFilePath, newConflictingRefs] = findRefByFilePath(manifest.elements.rbegin(), manifest.elements.rend()); auto [newConflictingFilePath, newEntryName, newConflictingRefs] = findRefByFilePath(manifest.elements.rbegin(), manifest.elements.rend());
throw Error( throw Error(
"An existing package already provides the following file:\n" "An existing package already provides the following file:\n"
@ -443,7 +443,7 @@ struct CmdProfileInstall : InstallablesCommand, MixDefaultProfile
" nix profile install %4% --priority %7%\n", " nix profile install %4% --priority %7%\n",
originalConflictingFilePath, originalConflictingFilePath,
newConflictingFilePath, newConflictingFilePath,
concatStringsSep(" ", originalConflictingRefs), originalEntryName,
concatStringsSep(" ", newConflictingRefs), concatStringsSep(" ", newConflictingRefs),
conflictError.priority, conflictError.priority,
conflictError.priority - 1, conflictError.priority - 1,

2
tests/functional/nix-profile.sh
View file

@ -166,7 +166,7 @@ error: An existing package already provides the following file:
To remove the existing package: To remove the existing package:
nix profile remove path:${flake1Dir}#packages.${system}.default nix profile remove flake1
The new package can also be installed next to the existing one by assigning a different priority. The new package can also be installed next to the existing one by assigning a different priority.
The conflicting packages have a priority of 5. The conflicting packages have a priority of 5.