aboutsummaryrefslogtreecommitdiff
path: root/src/nix
diff options
context:
space:
mode:
Diffstat (limited to 'src/nix')
-rw-r--r--src/nix/develop.cc (renamed from src/nix/dev-shell.cc)14
-rw-r--r--src/nix/local.mk2
-rw-r--r--src/nix/main.cc13
-rw-r--r--src/nix/progress-bar.cc484
-rw-r--r--src/nix/progress-bar.hh11
-rw-r--r--src/nix/verify.cc5
6 files changed, 18 insertions, 511 deletions
diff --git a/src/nix/dev-shell.cc b/src/nix/develop.cc
index d300f6a23..3045d7dc3 100644
--- a/src/nix/dev-shell.cc
+++ b/src/nix/develop.cc
@@ -110,7 +110,7 @@ StorePath getDerivationEnvironment(ref<Store> store, const StorePath & drvPath)
auto builder = baseNameOf(drv.builder);
if (builder != "bash")
- throw Error("'nix dev-shell' only works on derivations that use 'bash' as their builder");
+ throw Error("'nix develop' only works on derivations that use 'bash' as their builder");
auto getEnvShPath = store->addTextToStore("get-env.sh", getEnvSh, {});
@@ -231,11 +231,11 @@ struct Common : InstallableCommand, MixProfile
}
};
-struct CmdDevShell : Common, MixEnvironment
+struct CmdDevelop : Common, MixEnvironment
{
std::vector<std::string> command;
- CmdDevShell()
+ CmdDevelop()
{
addFlag({
.longName = "command",
@@ -259,15 +259,15 @@ struct CmdDevShell : Common, MixEnvironment
return {
Example{
"To get the build environment of GNU hello:",
- "nix dev-shell nixpkgs.hello"
+ "nix develop nixpkgs.hello"
},
Example{
"To store the build environment in a profile:",
- "nix dev-shell --profile /tmp/my-shell nixpkgs.hello"
+ "nix develop --profile /tmp/my-shell nixpkgs.hello"
},
Example{
"To use a build environment previously recorded in a profile:",
- "nix dev-shell /tmp/my-shell"
+ "nix develop /tmp/my-shell"
},
};
}
@@ -341,4 +341,4 @@ struct CmdPrintDevEnv : Common
};
static auto r1 = registerCommand<CmdPrintDevEnv>("print-dev-env");
-static auto r2 = registerCommand<CmdDevShell>("dev-shell");
+static auto r2 = registerCommand<CmdDevelop>("develop");
diff --git a/src/nix/local.mk b/src/nix/local.mk
index 8c0eed19e..43b7754e3 100644
--- a/src/nix/local.mk
+++ b/src/nix/local.mk
@@ -28,4 +28,4 @@ $(eval $(call install-symlink, $(bindir)/nix, $(libexecdir)/nix/build-remote))
src/nix-env/user-env.cc: src/nix-env/buildenv.nix.gen.hh
-src/nix/dev-shell.cc: src/nix/get-env.sh.gen.hh
+src/nix/develop.cc: src/nix/get-env.sh.gen.hh
diff --git a/src/nix/main.cc b/src/nix/main.cc
index ef301580a..203901168 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -10,6 +10,7 @@
#include "progress-bar.hh"
#include "filetransfer.hh"
#include "finally.hh"
+#include "loggers.hh"
#include <sys/types.h>
#include <sys/socket.h>
@@ -90,7 +91,7 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs
.longName = "print-build-logs",
.shortName = 'L',
.description = "print full build logs on stderr",
- .handler = {&printBuildLogs, true},
+ .handler = {[&]() {setLogFormat(LogFormat::barWithLogs); }},
});
addFlag({
@@ -110,6 +111,8 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs
.description = "consider all previously downloaded files out-of-date",
.handler = {[&]() { refresh = true; }},
});
+
+ deprecatedAliases.insert({"dev-shell", "develop"});
}
void printFlags(std::ostream & out) override
@@ -163,6 +166,10 @@ void mainWrapped(int argc, char * * argv)
verbosity = lvlWarn;
settings.verboseBuild = false;
+ setLogFormat("bar");
+
+ Finally f([] { logger->stop(); });
+
NixArgs args;
args.parseCmdline(argvToStrings(argc, argv));
@@ -176,10 +183,6 @@ void mainWrapped(int argc, char * * argv)
&& args.command->first != "upgrade-nix")
settings.requireExperimentalFeature("nix-command");
- Finally f([]() { stopProgressBar(); });
-
- startProgressBar(args.printBuildLogs);
-
if (args.useNet && !haveInternet()) {
warn("you don't have Internet access; disabling some network-dependent features");
args.useNet = false;
diff --git a/src/nix/progress-bar.cc b/src/nix/progress-bar.cc
deleted file mode 100644
index 2fe26a001..000000000
--- a/src/nix/progress-bar.cc
+++ /dev/null
@@ -1,484 +0,0 @@
-#include "progress-bar.hh"
-#include "util.hh"
-#include "sync.hh"
-#include "store-api.hh"
-#include "names.hh"
-
-#include <atomic>
-#include <map>
-#include <thread>
-#include <iostream>
-
-namespace nix {
-
-static std::string getS(const std::vector<Logger::Field> & fields, size_t n)
-{
- assert(n < fields.size());
- assert(fields[n].type == Logger::Field::tString);
- return fields[n].s;
-}
-
-static uint64_t getI(const std::vector<Logger::Field> & fields, size_t n)
-{
- assert(n < fields.size());
- assert(fields[n].type == Logger::Field::tInt);
- return fields[n].i;
-}
-
-static std::string_view storePathToName(std::string_view path)
-{
- auto base = baseNameOf(path);
- auto i = base.find('-');
- return i == std::string::npos ? base.substr(0, 0) : base.substr(i + 1);
-}
-
-class ProgressBar : public Logger
-{
-private:
-
- struct ActInfo
- {
- std::string s, lastLine, phase;
- ActivityType type = actUnknown;
- uint64_t done = 0;
- uint64_t expected = 0;
- uint64_t running = 0;
- uint64_t failed = 0;
- std::map<ActivityType, uint64_t> expectedByType;
- bool visible = true;
- ActivityId parent;
- std::optional<std::string> name;
- };
-
- struct ActivitiesByType
- {
- std::map<ActivityId, std::list<ActInfo>::iterator> its;
- uint64_t done = 0;
- uint64_t expected = 0;
- uint64_t failed = 0;
- };
-
- struct State
- {
- std::list<ActInfo> activities;
- std::map<ActivityId, std::list<ActInfo>::iterator> its;
-
- std::map<ActivityType, ActivitiesByType> activitiesByType;
-
- uint64_t filesLinked = 0, bytesLinked = 0;
-
- uint64_t corruptedPaths = 0, untrustedPaths = 0;
-
- bool active = true;
- bool haveUpdate = true;
- };
-
- Sync<State> state_;
-
- std::thread updateThread;
-
- std::condition_variable quitCV, updateCV;
-
- bool printBuildLogs;
- bool isTTY;
-
-public:
-
- ProgressBar(bool printBuildLogs, bool isTTY)
- : printBuildLogs(printBuildLogs)
- , isTTY(isTTY)
- {
- state_.lock()->active = isTTY;
- updateThread = std::thread([&]() {
- auto state(state_.lock());
- while (state->active) {
- if (!state->haveUpdate)
- state.wait(updateCV);
- draw(*state);
- state.wait_for(quitCV, std::chrono::milliseconds(50));
- }
- });
- }
-
- ~ProgressBar()
- {
- stop();
- updateThread.join();
- }
-
- void stop()
- {
- auto state(state_.lock());
- if (!state->active) return;
- state->active = false;
- std::string status = getStatus(*state);
- writeToStderr("\r\e[K");
- if (status != "")
- writeToStderr("[" + status + "]\n");
- updateCV.notify_one();
- quitCV.notify_one();
- }
-
- void log(Verbosity lvl, const FormatOrString & fs) override
- {
- auto state(state_.lock());
- log(*state, lvl, fs.s);
- }
-
- void logEI(const ErrorInfo &ei) override
- {
- auto state(state_.lock());
-
- std::stringstream oss;
- oss << ei;
-
- log(*state, ei.level, oss.str());
- }
-
- void log(State & state, Verbosity lvl, const std::string & s)
- {
- if (state.active) {
- writeToStderr("\r\e[K" + filterANSIEscapes(s, !isTTY) + ANSI_NORMAL "\n");
- draw(state);
- } else {
- auto s2 = s + ANSI_NORMAL "\n";
- if (!isTTY) s2 = filterANSIEscapes(s2, true);
- writeToStderr(s2);
- }
- }
-
- void startActivity(ActivityId act, Verbosity lvl, ActivityType type,
- const std::string & s, const Fields & fields, ActivityId parent) override
- {
- auto state(state_.lock());
-
- if (lvl <= verbosity && !s.empty())
- log(*state, lvl, s + "...");
-
- state->activities.emplace_back(ActInfo());
- auto i = std::prev(state->activities.end());
- i->s = s;
- i->type = type;
- i->parent = parent;
- state->its.emplace(act, i);
- state->activitiesByType[type].its.emplace(act, i);
-
- if (type == actBuild) {
- auto name = storePathToName(getS(fields, 0));
- if (hasSuffix(name, ".drv"))
- name = name.substr(0, name.size() - 4);
- i->s = fmt("building " ANSI_BOLD "%s" ANSI_NORMAL, name);
- auto machineName = getS(fields, 1);
- if (machineName != "")
- i->s += fmt(" on " ANSI_BOLD "%s" ANSI_NORMAL, machineName);
- auto curRound = getI(fields, 2);
- auto nrRounds = getI(fields, 3);
- if (nrRounds != 1)
- i->s += fmt(" (round %d/%d)", curRound, nrRounds);
- i->name = DrvName(name).name;
- }
-
- if (type == actSubstitute) {
- auto name = storePathToName(getS(fields, 0));
- auto sub = getS(fields, 1);
- i->s = fmt(
- hasPrefix(sub, "local")
- ? "copying " ANSI_BOLD "%s" ANSI_NORMAL " from %s"
- : "fetching " ANSI_BOLD "%s" ANSI_NORMAL " from %s",
- name, sub);
- }
-
- if (type == actPostBuildHook) {
- auto name = storePathToName(getS(fields, 0));
- if (hasSuffix(name, ".drv"))
- name = name.substr(0, name.size() - 4);
- i->s = fmt("post-build " ANSI_BOLD "%s" ANSI_NORMAL, name);
- i->name = DrvName(name).name;
- }
-
- if (type == actQueryPathInfo) {
- auto name = storePathToName(getS(fields, 0));
- i->s = fmt("querying " ANSI_BOLD "%s" ANSI_NORMAL " on %s", name, getS(fields, 1));
- }
-
- if ((type == actFileTransfer && hasAncestor(*state, actCopyPath, parent))
- || (type == actFileTransfer && hasAncestor(*state, actQueryPathInfo, parent))
- || (type == actCopyPath && hasAncestor(*state, actSubstitute, parent)))
- i->visible = false;
-
- update(*state);
- }
-
- /* Check whether an activity has an ancestore with the specified
- type. */
- bool hasAncestor(State & state, ActivityType type, ActivityId act)
- {
- while (act != 0) {
- auto i = state.its.find(act);
- if (i == state.its.end()) break;
- if (i->second->type == type) return true;
- act = i->second->parent;
- }
- return false;
- }
-
- void stopActivity(ActivityId act) override
- {
- auto state(state_.lock());
-
- auto i = state->its.find(act);
- if (i != state->its.end()) {
-
- auto & actByType = state->activitiesByType[i->second->type];
- actByType.done += i->second->done;
- actByType.failed += i->second->failed;
-
- for (auto & j : i->second->expectedByType)
- state->activitiesByType[j.first].expected -= j.second;
-
- actByType.its.erase(act);
- state->activities.erase(i->second);
- state->its.erase(i);
- }
-
- update(*state);
- }
-
- void result(ActivityId act, ResultType type, const std::vector<Field> & fields) override
- {
- auto state(state_.lock());
-
- if (type == resFileLinked) {
- state->filesLinked++;
- state->bytesLinked += getI(fields, 0);
- update(*state);
- }
-
- else if (type == resBuildLogLine || type == resPostBuildLogLine) {
- auto lastLine = trim(getS(fields, 0));
- if (!lastLine.empty()) {
- auto i = state->its.find(act);
- assert(i != state->its.end());
- ActInfo info = *i->second;
- if (printBuildLogs) {
- auto suffix = "> ";
- if (type == resPostBuildLogLine) {
- suffix = " (post)> ";
- }
- log(*state, lvlInfo, ANSI_FAINT + info.name.value_or("unnamed") + suffix + ANSI_NORMAL + lastLine);
- } else {
- state->activities.erase(i->second);
- info.lastLine = lastLine;
- state->activities.emplace_back(info);
- i->second = std::prev(state->activities.end());
- update(*state);
- }
- }
- }
-
- else if (type == resUntrustedPath) {
- state->untrustedPaths++;
- update(*state);
- }
-
- else if (type == resCorruptedPath) {
- state->corruptedPaths++;
- update(*state);
- }
-
- else if (type == resSetPhase) {
- auto i = state->its.find(act);
- assert(i != state->its.end());
- i->second->phase = getS(fields, 0);
- update(*state);
- }
-
- else if (type == resProgress) {
- auto i = state->its.find(act);
- assert(i != state->its.end());
- ActInfo & actInfo = *i->second;
- actInfo.done = getI(fields, 0);
- actInfo.expected = getI(fields, 1);
- actInfo.running = getI(fields, 2);
- actInfo.failed = getI(fields, 3);
- update(*state);
- }
-
- else if (type == resSetExpected) {
- auto i = state->its.find(act);
- assert(i != state->its.end());
- ActInfo & actInfo = *i->second;
- auto type = (ActivityType) getI(fields, 0);
- auto & j = actInfo.expectedByType[type];
- state->activitiesByType[type].expected -= j;
- j = getI(fields, 1);
- state->activitiesByType[type].expected += j;
- update(*state);
- }
- }
-
- void update(State & state)
- {
- state.haveUpdate = true;
- updateCV.notify_one();
- }
-
- void draw(State & state)
- {
- state.haveUpdate = false;
- if (!state.active) return;
-
- std::string line;
-
- std::string status = getStatus(state);
- if (!status.empty()) {
- line += '[';
- line += status;
- line += "]";
- }
-
- if (!state.activities.empty()) {
- if (!status.empty()) line += " ";
- auto i = state.activities.rbegin();
-
- while (i != state.activities.rend() && (!i->visible || (i->s.empty() && i->lastLine.empty())))
- ++i;
-
- if (i != state.activities.rend()) {
- line += i->s;
- if (!i->phase.empty()) {
- line += " (";
- line += i->phase;
- line += ")";
- }
- if (!i->lastLine.empty()) {
- if (!i->s.empty()) line += ": ";
- line += i->lastLine;
- }
- }
- }
-
- auto width = getWindowSize().second;
- if (width <= 0) width = std::numeric_limits<decltype(width)>::max();
-
- writeToStderr("\r" + filterANSIEscapes(line, false, width) + "\e[K");
- }
-
- std::string getStatus(State & state)
- {
- auto MiB = 1024.0 * 1024.0;
-
- std::string res;
-
- auto renderActivity = [&](ActivityType type, const std::string & itemFmt, const std::string & numberFmt = "%d", double unit = 1) {
- auto & act = state.activitiesByType[type];
- uint64_t done = act.done, expected = act.done, running = 0, failed = act.failed;
- for (auto & j : act.its) {
- done += j.second->done;
- expected += j.second->expected;
- running += j.second->running;
- failed += j.second->failed;
- }
-
- expected = std::max(expected, act.expected);
-
- std::string s;
-
- if (running || done || expected || failed) {
- if (running)
- if (expected != 0)
- s = fmt(ANSI_BLUE + numberFmt + ANSI_NORMAL "/" ANSI_GREEN + numberFmt + ANSI_NORMAL "/" + numberFmt,
- running / unit, done / unit, expected / unit);
- else
- s = fmt(ANSI_BLUE + numberFmt + ANSI_NORMAL "/" ANSI_GREEN + numberFmt + ANSI_NORMAL,
- running / unit, done / unit);
- else if (expected != done)
- if (expected != 0)
- s = fmt(ANSI_GREEN + numberFmt + ANSI_NORMAL "/" + numberFmt,
- done / unit, expected / unit);
- else
- s = fmt(ANSI_GREEN + numberFmt + ANSI_NORMAL, done / unit);
- else
- s = fmt(done ? ANSI_GREEN + numberFmt + ANSI_NORMAL : numberFmt, done / unit);
- s = fmt(itemFmt, s);
-
- if (failed)
- s += fmt(" (" ANSI_RED "%d failed" ANSI_NORMAL ")", failed / unit);
- }
-
- return s;
- };
-
- auto showActivity = [&](ActivityType type, const std::string & itemFmt, const std::string & numberFmt = "%d", double unit = 1) {
- auto s = renderActivity(type, itemFmt, numberFmt, unit);
- if (s.empty()) return;
- if (!res.empty()) res += ", ";
- res += s;
- };
-
- showActivity(actBuilds, "%s built");
-
- auto s1 = renderActivity(actCopyPaths, "%s copied");
- auto s2 = renderActivity(actCopyPath, "%s MiB", "%.1f", MiB);
-
- if (!s1.empty() || !s2.empty()) {
- if (!res.empty()) res += ", ";
- if (s1.empty()) res += "0 copied"; else res += s1;
- if (!s2.empty()) { res += " ("; res += s2; res += ')'; }
- }
-
- showActivity(actFileTransfer, "%s MiB DL", "%.1f", MiB);
-
- {
- auto s = renderActivity(actOptimiseStore, "%s paths optimised");
- if (s != "") {
- s += fmt(", %.1f MiB / %d inodes freed", state.bytesLinked / MiB, state.filesLinked);
- if (!res.empty()) res += ", ";
- res += s;
- }
- }
-
- // FIXME: don't show "done" paths in green.
- showActivity(actVerifyPaths, "%s paths verified");
-
- if (state.corruptedPaths) {
- if (!res.empty()) res += ", ";
- res += fmt(ANSI_RED "%d corrupted" ANSI_NORMAL, state.corruptedPaths);
- }
-
- if (state.untrustedPaths) {
- if (!res.empty()) res += ", ";
- res += fmt(ANSI_RED "%d untrusted" ANSI_NORMAL, state.untrustedPaths);
- }
-
- return res;
- }
-
- void writeToStdout(std::string_view s) override
- {
- auto state(state_.lock());
- if (state->active) {
- std::cerr << "\r\e[K";
- Logger::writeToStdout(s);
- draw(*state);
- } else {
- Logger::writeToStdout(s);
- }
- }
-};
-
-void startProgressBar(bool printBuildLogs)
-{
- logger = new ProgressBar(
- printBuildLogs,
- isatty(STDERR_FILENO) && getEnv("TERM").value_or("dumb") != "dumb");
-}
-
-void stopProgressBar()
-{
- auto progressBar = dynamic_cast<ProgressBar *>(logger);
- if (progressBar) progressBar->stop();
-
-}
-
-}
diff --git a/src/nix/progress-bar.hh b/src/nix/progress-bar.hh
deleted file mode 100644
index 4d61175c2..000000000
--- a/src/nix/progress-bar.hh
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "logging.hh"
-
-namespace nix {
-
-void startProgressBar(bool printBuildLogs = false);
-
-void stopProgressBar();
-
-}
diff --git a/src/nix/verify.cc b/src/nix/verify.cc
index 8ecd9a8f3..246b4b480 100644
--- a/src/nix/verify.cc
+++ b/src/nix/verify.cc
@@ -104,11 +104,10 @@ struct CmdVerify : StorePathsCommand
.hint = hintfmt(
"path '%s' was modified! expected hash '%s', got '%s'",
store->printStorePath(info->path),
- info->narHash.to_string(),
- hash.first.to_string())
+ info->narHash.to_string(Base32, true),
+ hash.first.to_string(Base32, true))
});
}
-
}
if (!noTrust) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 17:53:16 +0000