From 9e592b8085663e493f2f5ed3ba469424a7ac586c Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 21 Feb 2022 23:12:53 +0100 Subject: [PATCH] patch: cli overrides beta, nix-dram edition --- src/libcmd/command.hh | 12 ++- src/libcmd/installables.cc | 180 +++++++++++++++++++++++++++++++++---- 2 files changed, 171 insertions(+), 21 deletions(-) diff --git a/src/libcmd/command.hh b/src/libcmd/command.hh index 3d0af6258..e95f69ea2 100644 --- a/src/libcmd/command.hh +++ b/src/libcmd/command.hh @@ -95,6 +95,10 @@ struct SourceExprCommand : virtual Args, MixFlakeOptions std::optional file; std::optional expr; std::optional applyToInstallable; + std::optional installableOverrideAttrs; + std::optional installableWithPackages; + + std::map overrideArgs; // FIXME: move this; not all commands (e.g. 'nix run') use it. OperateOn operateOn = OperateOn::Output; @@ -102,10 +106,14 @@ struct SourceExprCommand : virtual Args, MixFlakeOptions SourceExprCommand(); std::vector> parseInstallables( - ref store, std::vector ss); + ref store, std::vector ss, + bool applyOverrides = true, bool nestedIsExprOk = true); + + Bindings * getOverrideArgs(EvalState & state, ref store); std::shared_ptr parseInstallable( - ref store, const std::string & installable); + ref store, const std::string & installable, + bool applyOverrides = true, bool nestedIsExprOk = true); virtual Strings getDefaultFlakeAttrPaths(); diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc index 1e773e693..8451db76a 100644 --- a/src/libcmd/installables.cc +++ b/src/libcmd/installables.cc @@ -166,6 +166,46 @@ SourceExprCommand::SourceExprCommand() .labels = {"expr"}, .handler = {&applyToInstallable}, }); + + addFlag({ + .longName = "override", + .description = "Override derivation arguments: --override *name* *expr*", + .category = installablesCategory, + .labels = {"name", "expr"}, + .handler = {[&](std::string name, std::string expr) { overrideArgs[name] = 'E' + expr; }} + }); + + addFlag({ + .longName = "override-pkg", + .description = "Override dependency *name* of the given derivations with other packages, using *flakeref*.", + .category = installablesCategory, + .labels = {"name", "flakeref"}, + .handler = {[&](std::string name, std::string expr) { overrideArgs[name] = 'F' + expr; }} + }); + + addFlag({ + .longName = "override-from", + .description = "Override dependency *name* of the given derivations with other packages, using *attrpath*. (Only applicable when using --file)", + .category = installablesCategory, + .labels = {"name", "attrpath"}, + .handler = {[&](std::string name, std::string expr) { overrideArgs[name] = 'X' + expr; }} + }); + + addFlag({ + .longName = "override-attrs", + .description = "Override the given derivations' attributes using *expr*.", + .category = installablesCategory, + .labels = {"expr"}, + .handler = {&installableOverrideAttrs}, + }); + + addFlag({ + .longName = "with", + .description = "Enhance the given derivations using an environment specified in *expr*.", + .category = installablesCategory, + .labels = {"expr"}, + .handler = {&installableWithPackages}, + }); } Strings SourceExprCommand::getDefaultFlakeAttrPaths() @@ -731,12 +771,44 @@ FlakeRef InstallableFlake::nixpkgsFlakeRef() const return Installable::nixpkgsFlakeRef(); } +Bindings * SourceExprCommand::getOverrideArgs(EvalState & state, ref store) +{ + Bindings * res = state.allocBindings(overrideArgs.size()); + for (auto & i : overrideArgs) { + Value * v = state.allocValue(); + if (i.second[0] == 'E') { + // is a raw expression, parse + state.mkThunk_(*v, state.parseExprFromString(string(i.second, 1), absPath("."))); + } else if (i.second[0] == 'F') { + // is a flakeref + auto [vNew, pos] = parseInstallable(store, string(i.second, 1), false, false)->toValue(state); + v = vNew; + } else if (i.second[0] == 'X') { + // is not a flakeref, use attrPath from file + // error because --override covers expressions already + if (!file) + throw Error("no file to reference override from"); + auto [vNew, pos] = parseInstallable(store, string(i.second, 1), false, true)->toValue(state); + v = vNew; + } else { + throw Error("[BUG] unknown argtype %s",i.second[0]); + } + res->push_back(Attr(state.symbols.create(i.first), v)); + } + res->sort(); + return res; +} + std::vector> SourceExprCommand::parseInstallables( - ref store, std::vector ss) + ref store, std::vector ss, + bool applyOverrides, bool nestedIsExprOk) { std::vector> result; - if (file || expr) { + auto modifyInstallable = applyOverrides && ( applyToInstallable + || installableOverrideAttrs || installableWithPackages || overrideArgs.size() > 0 ); + + if (nestedIsExprOk && (file || expr)) { if (file && expr) throw UsageError("'--file' and '--expr' are exclusive"); @@ -753,26 +825,62 @@ std::vector> SourceExprCommand::parseInstallables( state->eval(e, *vFile); } - if (applyToInstallable) { - auto vApply = state->allocValue(); - state->eval(state->parseExprFromString(*applyToInstallable, absPath(".")), *vApply); - auto vRes = state->allocValue(); - state->callFunction(*vApply, *vFile, *vRes, noPos); - vFile = vRes; + for (auto & s : ss) { + auto installableAttr = std::make_shared(state, *this, vFile, s == "." ? "" : s); + if (modifyInstallable) { + auto [v, pos] = installableAttr->toValue(*state); + auto vApply = state->allocValue(); + auto vRes = state->allocValue(); + auto state = getEvalState(); + auto overrideSet = getOverrideArgs(*state, store); + + // FIXME merge this and the code for the flake version into a single function ("modifyInstallables()"?) + if (applyToInstallable) { + state->eval(state->parseExprFromString(*applyToInstallable, absPath(".")), *vApply); + state->callFunction(*vApply, *v, *vRes, noPos); + } else if (overrideSet->size() > 0) { + Value * overrideValues = state->allocValue(); + overrideValues->mkAttrs(state->buildBindings(overrideSet->size()).finish()); + for (auto& v : *overrideSet) { + overrideValues->attrs->push_back(v); + } + auto vOverrideFunctorAttr = v->attrs->get(state->symbols.create("override")); + if (!vOverrideFunctorAttr) { + throw Error("%s is not overridable", s); + } + auto vOverrideFunctor = vOverrideFunctorAttr->value; + state->callFunction(*vOverrideFunctor, *overrideValues, *vRes, noPos); + } else if (installableOverrideAttrs) { + state->eval(state->parseExprFromString(fmt("old: with old; %s",*installableOverrideAttrs), absPath(".")), *vApply); + auto vOverrideFunctorAttr = v->attrs->get(state->symbols.create("overrideAttrs")); + if (!vOverrideFunctorAttr) { + throw Error("%s is not overrideAttrs-capable", s); + } + auto vOverrideFunctor = vOverrideFunctorAttr->value; + state->callFunction(*vOverrideFunctor, *vApply, *vRes, noPos); + } else if (installableWithPackages) { + state->eval(state->parseExprFromString(fmt("ps: with ps; %s",*installableWithPackages), absPath(".")), *vApply); + auto vOverrideFunctorAttr = v->attrs->get(state->symbols.create("withPackages")); + if (!vOverrideFunctorAttr) { + throw Error("%s cannot be extended with additional packages", s); + } + auto vOverrideFunctor = vOverrideFunctorAttr->value; + state->callFunction(*vOverrideFunctor, *vApply, *vRes, noPos); + } + result.push_back(std::make_shared(state, *this, vRes, "")); + } else { + result.push_back(installableAttr); + } } - - for (auto & s : ss) - result.push_back(std::make_shared(state, *this, vFile, s == "." ? "" : s)); - } else { for (auto & s : ss) { std::exception_ptr ex; if (s.find('/') != std::string::npos) { - if (applyToInstallable) { + /*if (modifyInstallable) { throw Error("cannot apply function: installable cannot be evaluated"); - } + }*/ try { result.push_back(std::make_shared(store, store->followLinksToStorePath(s))); continue; @@ -800,12 +908,45 @@ std::vector> SourceExprCommand::parseInstallables( getDefaultFlakeAttrPaths(), getDefaultFlakeAttrPathPrefixes(), lockFlags); - if (applyToInstallable) { + if (modifyInstallable) { auto [v, pos] = installableFlake->toValue(*state); auto vApply = state->allocValue(); - state->eval(state->parseExprFromString(*applyToInstallable, absPath(".")), *vApply); auto vRes = state->allocValue(); - state->callFunction(*vApply, *v, *vRes, noPos); + auto state = getEvalState(); + auto overrideSet = getOverrideArgs(*state, store); + + if (applyToInstallable) { + state->eval(state->parseExprFromString(*applyToInstallable, absPath(".")), *vApply); + state->callFunction(*vApply, *v, *vRes, noPos); + } else if (overrideSet->size() > 0) { + Value * overrideValues = state->allocValue(); + overrideValues->mkAttrs(state->buildBindings(overrideSet->size()).finish()); + for (auto& v : *overrideSet) { + overrideValues->attrs->push_back(v); + } + auto vOverrideFunctorAttr = v->attrs->get(state->symbols.create("override")); + if (!vOverrideFunctorAttr) { + throw Error("%s is not overridable", s); + } + auto vOverrideFunctor = vOverrideFunctorAttr->value; + state->callFunction(*vOverrideFunctor, *overrideValues, *vRes, noPos); + } else if (installableOverrideAttrs) { + state->eval(state->parseExprFromString(fmt("old: with old; %s",*installableOverrideAttrs), absPath(".")), *vApply); + auto vOverrideFunctorAttr = v->attrs->get(state->symbols.create("overrideAttrs")); + if (!vOverrideFunctorAttr) { + throw Error("%s is not overrideAttrs-capable", s); + } + auto vOverrideFunctor = vOverrideFunctorAttr->value; + state->callFunction(*vOverrideFunctor, *vApply, *vRes, noPos); + } else if (installableWithPackages) { + state->eval(state->parseExprFromString(fmt("ps: with ps; %s",*installableWithPackages), absPath(".")), *vApply); + auto vOverrideFunctorAttr = v->attrs->get(state->symbols.create("withPackages")); + if (!vOverrideFunctorAttr) { + throw Error("%s cannot be extended with additional packages", s); + } + auto vOverrideFunctor = vOverrideFunctorAttr->value; + state->callFunction(*vOverrideFunctor, *vApply, *vRes, noPos); + } result.push_back(std::make_shared(state, *this, vRes, "")); } else { result.push_back(installableFlake); @@ -823,9 +964,10 @@ std::vector> SourceExprCommand::parseInstallables( } std::shared_ptr SourceExprCommand::parseInstallable( - ref store, const std::string & installable) + ref store, const std::string & installable, + bool applyOverrides, bool nestedIsExprOk) { - auto installables = parseInstallables(store, {installable}); + auto installables = parseInstallables(store, {installable}, applyOverrides, nestedIsExprOk); assert(installables.size() == 1); return installables.front(); }