lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nix-shell: allow symlinks to .drvs

Browse source 
This makes persistent shell environments easier to use.
This commit is contained in:
Linus Heckemann 2018-03-16 22:15:24 +00:00
parent 48662d151b
commit 12913ccf45
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nix-build/nix-build.cc
View file

@ -271,10 +271,14 @@ void mainWrapped(int argc, char * * argv)
exprs = {state.parseStdin()}; exprs = {state.parseStdin()};
else else
for (auto i : left) { for (auto i : left) {
auto absolute = i;
try {
absolute = canonPath(absPath(i), true);
} catch (Error e) {};
if (fromArgs) if (fromArgs)
exprs.push_back(state.parseExprFromString(i, absPath("."))); exprs.push_back(state.parseExprFromString(i, absPath(".")));
else if (store->isStorePath(i) && std::regex_match(i, std::regex(".*\\.drv(!.*)?"))) else if (store->isStorePath(absolute) && std::regex_match(absolute, std::regex(".*\\.drv(!.*)?")))
drvs.push_back(DrvInfo(state, store, i)); drvs.push_back(DrvInfo(state, store, absolute));
else else
/* If we're in a #! script, interpret filenames /* If we're in a #! script, interpret filenames
relative to the script. */ relative to the script. */

2
src/nix-instantiate/nix-instantiate.cc
View file

@ -70,7 +70,7 @@ void processExpr(EvalState & state, const Strings & attrPaths,
if (gcRoot == "") if (gcRoot == "")
printGCWarning(); printGCWarning();
else { else {
Path rootName = gcRoot; Path rootName = indirectRoot ? absPath(gcRoot) : gcRoot;
if (++rootNr > 1) rootName += "-" + std::to_string(rootNr); if (++rootNr > 1) rootName += "-" + std::to_string(rootNr);
auto store2 = state.store.dynamic_pointer_cast<LocalFSStore>(); auto store2 = state.store.dynamic_pointer_cast<LocalFSStore>();
if (store2) if (store2)

12
tests/nix-shell.sh
View file

@ -17,6 +17,18 @@ output=$(nix-shell --pure shell.nix -A shellDrv --run \
[[ $(nix-shell --pure $(nix-instantiate shell.nix -A shellDrv) --run \ [[ $(nix-shell --pure $(nix-instantiate shell.nix -A shellDrv) --run \
'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"') = " - foo - bar" ]] 'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"') = " - foo - bar" ]]
# Test nix-shell on a .drv symlink
# Legacy: absolute path and .drv extension required
nix-instantiate shell.nix -A shellDrv --indirect --add-root shell.drv
[[ $(nix-shell --pure $PWD/shell.drv --run \
'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"') = " - foo - bar" ]]
# New behaviour: just needs to resolve to a derivation in the store
nix-instantiate shell.nix -A shellDrv --indirect --add-root shell
[[ $(nix-shell --pure shell --run \
'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"') = " - foo - bar" ]]
# Test nix-shell -p # Test nix-shell -p
output=$(NIX_PATH=nixpkgs=shell.nix nix-shell --pure -p foo bar --run 'echo "$(foo) $(bar)"') output=$(NIX_PATH=nixpkgs=shell.nix nix-shell --pure -p foo bar --run 'echo "$(foo) $(bar)"')
[ "$output" = "foo bar" ] [ "$output" = "foo bar" ]