aboutsummaryrefslogtreecommitdiff
path: root/src/nix
diff options
context:
space:
mode:
Diffstat (limited to 'src/nix')
-rw-r--r--src/nix/diff-closures.cc10
-rw-r--r--src/nix/profile.cc268
2 files changed, 4 insertions, 274 deletions
diff --git a/src/nix/diff-closures.cc b/src/nix/diff-closures.cc
index c7c37b66f..736cbf55d 100644
--- a/src/nix/diff-closures.cc
+++ b/src/nix/diff-closures.cc
@@ -1,4 +1,5 @@
#include "command.hh"
+#include "cmd-profiles.hh"
#include "shared.hh"
#include "store-api.hh"
#include "common-args.hh"
@@ -43,15 +44,6 @@ GroupedPaths getClosureInfo(ref<Store> store, const StorePath & toplevel)
return groupedPaths;
}
-std::string showVersions(const std::set<std::string> & versions)
-{
- if (versions.empty()) return "∅";
- std::set<std::string> versions2;
- for (auto & version : versions)
- versions2.insert(version.empty() ? "ε" : version);
- return concatStringsSep(", ", versions2);
-}
-
void printClosureDiff(
ref<Store> store,
const StorePath & beforePath,
diff --git a/src/nix/profile.cc b/src/nix/profile.cc
index 476ddcd60..67f97ca9b 100644
--- a/src/nix/profile.cc
+++ b/src/nix/profile.cc
@@ -1,4 +1,5 @@
#include "command.hh"
+#include "cmd-profiles.hh"
#include "installable-flake.hh"
#include "common-args.hh"
#include "shared.hh"
@@ -17,269 +18,6 @@
using namespace nix;
-struct ProfileElementSource
-{
- FlakeRef originalRef;
- // FIXME: record original attrpath.
- FlakeRef lockedRef;
- std::string attrPath;
- ExtendedOutputsSpec outputs;
-
- bool operator < (const ProfileElementSource & other) const
- {
- return
- std::tuple(originalRef.to_string(), attrPath, outputs) <
- std::tuple(other.originalRef.to_string(), other.attrPath, other.outputs);
- }
-
- std::string to_string() const
- {
- return fmt("%s#%s%s", originalRef, attrPath, outputs.to_string());
- }
-};
-
-const int defaultPriority = 5;
-
-struct ProfileElement
-{
- StorePathSet storePaths;
- std::optional<ProfileElementSource> source;
- bool active = true;
- int priority = defaultPriority;
-
- std::string identifier() const
- {
- if (source)
- return source->to_string();
- StringSet names;
- for (auto & path : storePaths)
- names.insert(DrvName(path.name()).name);
- return concatStringsSep(", ", names);
- }
-
- /**
- * Return a string representing an installable corresponding to the current
- * element, either a flakeref or a plain store path
- */
- std::set<std::string> toInstallables(Store & store)
- {
- if (source)
- return {source->to_string()};
- StringSet rawPaths;
- for (auto & path : storePaths)
- rawPaths.insert(store.printStorePath(path));
- return rawPaths;
- }
-
- std::string versions() const
- {
- StringSet versions;
- for (auto & path : storePaths)
- versions.insert(DrvName(path.name()).version);
- return showVersions(versions);
- }
-
- bool operator < (const ProfileElement & other) const
- {
- return std::tuple(identifier(), storePaths) < std::tuple(other.identifier(), other.storePaths);
- }
-
- void updateStorePaths(
- ref<Store> evalStore,
- ref<Store> store,
- const BuiltPaths & builtPaths)
- {
- storePaths.clear();
- for (auto & buildable : builtPaths) {
- std::visit(overloaded {
- [&](const BuiltPath::Opaque & bo) {
- storePaths.insert(bo.path);
- },
- [&](const BuiltPath::Built & bfd) {
- for (auto & output : bfd.outputs)
- storePaths.insert(output.second);
- },
- }, buildable.raw());
- }
- }
-};
-
-struct ProfileManifest
-{
- std::vector<ProfileElement> elements;
-
- ProfileManifest() { }
-
- ProfileManifest(EvalState & state, const Path & profile)
- {
- auto manifestPath = profile + "/manifest.json";
-
- if (pathExists(manifestPath)) {
- auto json = nlohmann::json::parse(readFile(manifestPath));
-
- auto version = json.value("version", 0);
- std::string sUrl;
- std::string sOriginalUrl;
- switch (version) {
- case 1:
- sUrl = "uri";
- sOriginalUrl = "originalUri";
- break;
- case 2:
- sUrl = "url";
- sOriginalUrl = "originalUrl";
- break;
- default:
- throw Error("profile manifest '%s' has unsupported version %d", manifestPath, version);
- }
-
- for (auto & e : json["elements"]) {
- ProfileElement element;
- for (auto & p : e["storePaths"])
- element.storePaths.insert(state.store->parseStorePath((std::string) p));
- element.active = e["active"];
- if(e.contains("priority")) {
- element.priority = e["priority"];
- }
- if (e.value(sUrl, "") != "") {
- element.source = ProfileElementSource {
- parseFlakeRef(e[sOriginalUrl]),
- parseFlakeRef(e[sUrl]),
- e["attrPath"],
- e["outputs"].get<ExtendedOutputsSpec>()
- };
- }
- elements.emplace_back(std::move(element));
- }
- }
-
- else if (pathExists(profile + "/manifest.nix")) {
- // FIXME: needed because of pure mode; ugly.
- state.allowPath(state.store->followLinksToStore(profile));
- state.allowPath(state.store->followLinksToStore(profile + "/manifest.nix"));
-
- auto drvInfos = queryInstalled(state, state.store->followLinksToStore(profile));
-
- for (auto & drvInfo : drvInfos) {
- ProfileElement element;
- element.storePaths = {drvInfo.queryOutPath()};
- elements.emplace_back(std::move(element));
- }
- }
- }
-
- nlohmann::json toJSON(Store & store) const
- {
- auto array = nlohmann::json::array();
- for (auto & element : elements) {
- auto paths = nlohmann::json::array();
- for (auto & path : element.storePaths)
- paths.push_back(store.printStorePath(path));
- nlohmann::json obj;
- obj["storePaths"] = paths;
- obj["active"] = element.active;
- obj["priority"] = element.priority;
- if (element.source) {
- obj["originalUrl"] = element.source->originalRef.to_string();
- obj["url"] = element.source->lockedRef.to_string();
- obj["attrPath"] = element.source->attrPath;
- obj["outputs"] = element.source->outputs;
- }
- array.push_back(obj);
- }
- nlohmann::json json;
- json["version"] = 2;
- json["elements"] = array;
- return json;
- }
-
- StorePath build(ref<Store> store)
- {
- auto tempDir = createTempDir();
-
- StorePathSet references;
-
- Packages pkgs;
- for (auto & element : elements) {
- for (auto & path : element.storePaths) {
- if (element.active)
- pkgs.emplace_back(store->printStorePath(path), true, element.priority);
- references.insert(path);
- }
- }
-
- buildProfile(tempDir, std::move(pkgs));
-
- writeFile(tempDir + "/manifest.json", toJSON(*store).dump());
-
- /* Add the symlink tree to the store. */
- StringSink sink;
- dumpPath(tempDir, sink);
-
- auto narHash = hashString(htSHA256, sink.s);
-
- ValidPathInfo info {
- *store,
- "profile",
- FixedOutputInfo {
- .method = FileIngestionMethod::Recursive,
- .hash = narHash,
- .references = {
- .others = std::move(references),
- // profiles never refer to themselves
- .self = false,
- },
- },
- narHash,
- };
- info.narSize = sink.s.size();
-
- StringSource source(sink.s);
- store->addToStore(info, source);
-
- return std::move(info.path);
- }
-
- static void printDiff(const ProfileManifest & prev, const ProfileManifest & cur, std::string_view indent)
- {
- auto prevElems = prev.elements;
- std::sort(prevElems.begin(), prevElems.end());
-
- auto curElems = cur.elements;
- std::sort(curElems.begin(), curElems.end());
-
- auto i = prevElems.begin();
- auto j = curElems.begin();
-
- bool changes = false;
-
- while (i != prevElems.end() || j != curElems.end()) {
- if (j != curElems.end() && (i == prevElems.end() || i->identifier() > j->identifier())) {
- logger->cout("%s%s: ∅ -> %s", indent, j->identifier(), j->versions());
- changes = true;
- ++j;
- }
- else if (i != prevElems.end() && (j == curElems.end() || i->identifier() < j->identifier())) {
- logger->cout("%s%s: %s -> ∅", indent, i->identifier(), i->versions());
- changes = true;
- ++i;
- }
- else {
- auto v1 = i->versions();
- auto v2 = j->versions();
- if (v1 != v2) {
- logger->cout("%s%s: %s -> %s", indent, i->identifier(), v1, v2);
- changes = true;
- }
- ++i;
- ++j;
- }
- }
-
- if (!changes)
- logger->cout("%sNo changes.", indent);
- }
-};
static std::map<Installable *, std::pair<BuiltPaths, ref<ExtraPathInfo>>>
builtPathsPerInstallable(
@@ -361,8 +99,8 @@ struct CmdProfileInstall : InstallablesCommand, MixDefaultProfile
: ({
auto * info2 = dynamic_cast<ExtraPathInfoValue *>(&*info);
info2
- ? info2->value.priority.value_or(defaultPriority)
- : defaultPriority;
+ ? info2->value.priority.value_or(DEFAULT_PRIORITY)
+ : DEFAULT_PRIORITY;
});
element.updateStorePaths(getEvalStore(), store, res);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 11:48:41 +0000