From 9cd3ff1059e9daffe65e24dc826268f1e69e2593 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Apr 2012 17:19:43 +0200 Subject: [PATCH] nix-instantiate: default to "default.nix" if no arguments are given --- doc/manual/nix-instantiate.xml | 5 +++-- src/nix-instantiate/nix-instantiate.cc | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/manual/nix-instantiate.xml b/doc/manual/nix-instantiate.xml index 7e6120852..618b61f15 100644 --- a/doc/manual/nix-instantiate.xml +++ b/doc/manual/nix-instantiate.xml @@ -50,8 +50,9 @@ The command nix-instantiate generates store derivations from (high-level) Nix expressions. It loads and evaluates the Nix expressions in each -of files. Each top-level expression should -evaluate to a derivation, a list of derivations, or a set of +of files (which defaults to +./default.nix). Each top-level expression +should evaluate to a derivation, a list of derivations, or a set of derivations. The paths of the resulting store derivations are printed on standard output. diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index adc8ca623..d86c9fc84 100644 --- a/src/nix-instantiate/nix-instantiate.cc +++ b/src/nix-instantiate/nix-instantiate.cc @@ -148,7 +148,8 @@ void run(Strings args) Expr * e = parseStdin(state); processExpr(state, attrPaths, parseOnly, strict, autoArgs, evalOnly, xmlOutput, xmlOutputSourceLocation, e); - } + } else if (files.empty()) + files.push_back("./default.nix"); foreach (Strings::iterator, i, files) { Expr * e = state.parseExprFromFile(lookupFileArg(state, *i));