From b632153ebd1bf8d773872eb36f9ad335d2c89fab Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 10 Feb 2014 10:25:13 +0100 Subject: [PATCH] nix-shell: Use shell.nix as the default expression if it exists --- doc/manual/nix-shell.xml | 18 ++++++++++++------ scripts/nix-build.in | 3 ++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/doc/manual/nix-shell.xml b/doc/manual/nix-shell.xml index 866b3413b..e57c726f5 100644 --- a/doc/manual/nix-shell.xml +++ b/doc/manual/nix-shell.xml @@ -31,20 +31,26 @@ cmd regexp - paths + path Description -The command nix-shell will build -the dependencies of the specified derivation, but not the derivation +The command nix-shell will build the +dependencies of the specified derivation, but not the derivation itself. It will then start an interactive shell in which all -environment variables defined by the derivation have been set to their -corresponding values, and the script $stdenv/setup -has been sourced. This is useful for reproducing the environment of a +environment variables defined by the derivation +path have been set to their corresponding +values, and the script $stdenv/setup has been +sourced. This is useful for reproducing the environment of a derivation for development. +If path is not given, +nix-shell defaults to +shell.nix if it exists, and +default.nix otherwise. + diff --git a/scripts/nix-build.in b/scripts/nix-build.in index 168730bbc..fff71021f 100755 --- a/scripts/nix-build.in +++ b/scripts/nix-build.in @@ -149,7 +149,8 @@ for (my $n = 0; $n < scalar @ARGV; $n++) { } } -@exprs = ("./default.nix") if scalar @exprs == 0; +@exprs = ("shell.nix") if scalar @exprs == 0 && $runEnv && -e "shell.nix"; +@exprs = ("default.nix") if scalar @exprs == 0; $ENV{'IN_NIX_SHELL'} = 1 if $runEnv;