Replace defaultBla.$system with bla.$system.default

This also simplifies some InstallableFlake logic and fixes 'nix bundle' parsing its installable twice. Fixes #5532.
2022-02-22 11:47:41 +01:00
parent caf5172945
commit 162fbe31ff
9 changed files with 61 additions and 41 deletions
@@ -325,8 +325,15 @@ struct Common : InstallableCommand, MixProfile

    Strings getDefaultFlakeAttrPaths() override
    {
-        return {"devShell." + settings.thisSystem.get(), "defaultPackage." + settings.thisSystem.get()};
+        Strings paths{
+            "devShells." + settings.thisSystem.get() + ".default",
+            "devShell." + settings.thisSystem.get(),
+        };
+        for (auto & p : SourceExprCommand::getDefaultFlakeAttrPaths())
+            paths.push_back(p);
+        return paths;
    }
+
    Strings getDefaultFlakeAttrPathPrefixes() override
    {
        auto res = SourceExprCommand::getDefaultFlakeAttrPathPrefixes();