profile install: fail on conflicting name

NixOS · Feb 22, 2024 · fdf8487 · fdf8487
1 parent d3d0cb2
commit fdf8487
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/nix/profile.cc b/src/nix/profile.cc
@@ -200,6 +200,13 @@ struct ProfileManifest
         addElement(name, std::move(element));
     }
 
+    bool insertElement(ProfileElement element)
+    {
+        auto name = getNameFromElement(element);
+        auto [iterator, inserted] = elements.insert({name, std::move(element)});
+        return inserted;
+    }
+
     nlohmann::json toJSON(Store & store) const
     {
         auto es = nlohmann::json::object();
@@ -393,7 +400,14 @@ struct CmdProfileInstall : InstallablesCommand, MixDefaultProfile
 
             element.updateStorePaths(getEvalStore(), store, res);
 
-            manifest.addElement(std::move(element));
+            if (!manifest.insertElement(element)) {
+                std::string name = getNameFromElement(element);
+                throw Error(
+                    "Package '%s' is already in the profile.\n"
+                    "Remove the package first using 'nix profile remove %s'.",
+                    name
+                );
+            }
         }
 
         try {

diff --git a/tests/functional/nix-profile.sh b/tests/functional/nix-profile.sh
@@ -149,6 +149,7 @@ printf World2 > $flake2Dir/who
 
 nix profile install $flake1Dir
 [[ $($TEST_HOME/.nix-profile/bin/hello) = "Hello World" ]]
+expect 1 nix profile install $flake1Dir
 expect 1 nix profile install $flake2Dir
 diff -u <(
     nix --offline profile install $flake2Dir 2>&1 1> /dev/null \