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

profile: make --all exclusive

Browse source
This commit is contained in:
Bob van der Linden 2024-03-06 22:46:47 +01:00
parent 7a4d5e89d3
commit 91f068c193
No known key found for this signature in database
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nix/profile.cc
View file

@ -554,6 +554,15 @@ public:
throw UsageError("No packages specified."); throw UsageError("No packages specified.");
} }
if (std::find_if(_matchers.begin(), _matchers.end(), [](const Matcher & m) { return m.type == MatcherType::All; }) != _matchers.end() && _matchers.size() > 1) {
throw UsageError("--all cannot be used with package names or regular expressions.");
}
if (manifest.elements.empty()) {
warn("There are no packages in the profile.");
return {};
}
std::set<std::string> result; std::set<std::string> result;
for (auto & matcher : _matchers) { for (auto & matcher : _matchers) {
bool foundMatch = false; bool foundMatch = false;

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

@ -84,6 +84,12 @@ nix profile upgrade --all
nix profile rollback nix profile rollback
printf 1.0 > $flake1Dir/version printf 1.0 > $flake1Dir/version
# Test --all exclusivity.
assertStderr nix --offline profile upgrade --all foo << EOF
error: --all cannot be used with package names or regular expressions.
Try 'nix --help' for more information.
EOF
# Test matching no packages using literal package name. # Test matching no packages using literal package name.
assertStderr nix --offline profile upgrade this_package_is_not_installed << EOF assertStderr nix --offline profile upgrade this_package_is_not_installed << EOF
warning: Package name 'this_package_is_not_installed' does not match any packages in the profile. warning: Package name 'this_package_is_not_installed' does not match any packages in the profile.