lix-project/lix
20
58
Fork 31
Code Issues 353 Code Review (Gerrit) Projects 3 Releases Wiki Activity
12917 commits 29 branches 6 tags 89 MiB
Commit graph

140 commits

Author SHA1 Message Date
Eelco Dolstra 90948a4e3a
nix-shell/nix-build: Support .drv files again 
Fixes #1663.

Also handle '!<output-name>' (#1694).
 2017-11-24 18:08:35 +01:00
Eelco Dolstra 12991152be
nix-build: Fix --hash 2017-10-30 13:31:05 +01:00
Eelco Dolstra 2d5b1b24bf
Pass lists/attrsets to bash as (associative) arrays 2017-10-25 13:01:50 +02:00
Eelco Dolstra 0d59f1ca49
nix: Respect -I, --arg, --argstr 
Also, random cleanup to argument handling.
 2017-10-24 12:58:34 +02:00
Shea Levy c7af84ce84
nix-shell: Fix file name resolution in shebangs 2017-10-19 15:02:40 -04:00
Eelco Dolstra 84f112b1c8
nix-shell: Ignore readFile() errors 
Fixes #1563.
 2017-09-18 13:28:00 +02:00
Jörg Thalheim 2fd8f8bb99 Replace Unicode quotes in user-facing strings by ASCII 
Relevant RFC: NixOS/rfcs#4

$ ag -l | xargs sed -i -e "/\"/s/’/'/g;/\"/s/‘/'/g"
 2017-07-30 12:32:45 +01:00
Eelco Dolstra c7654bc491
nix-build: Fix regression causing all outputs to be built 2017-07-28 15:17:52 +02:00
Eelco Dolstra 4c9ff89c26
nix-build/nix-shell: Eliminate call to nix-instantiate / nix-store 
Note that this removes the need for a derivation symlink, so the
--drv-path and --add-drv-link flags now do nothing.
 2017-07-26 17:29:09 +02:00
Eelco Dolstra c94f3d5575
nix-shell: Use bashInteractive from <nixpkgs> 
This adds about 0.1s to nix-shell runtime in the case where
bashInteractive already exists.

See discussion at https://github.com/NixOS/nixpkgs/issues/27493.
 2017-07-20 13:50:25 +02:00
Eelco Dolstra 0a5a867758
nix-shell: Respect --dry-run 
Fixes #824.
 2017-07-03 11:54:30 +02:00
Eelco Dolstra a7e55151a8
Fix #1314 
Also, make nix-shell respect --option. (Previously it only passed it
along to nix-instantiate and nix-build.)
 2017-05-24 11:33:42 +02:00
Eelco Dolstra fbe9fe0e75
Merge branch 'topic/cores-master' of https://github.com/neilmayhew/nix 2017-05-24 11:28:36 +02:00
Eelco Dolstra 9711524188
Fix #1380 
It lacked a backslash. Use a raw string and single quotes around PS1
to simplify this.
 2017-05-24 11:23:28 +02:00
Linus Heckemann d48edcc3a5 nix-shell: use appropriate prompt terminator 
If running nix-shell as root, the terminator should be # and not $.
 2017-05-10 12:03:45 +01:00
Eelco Dolstra 08355643ab
nix-shell: Implement passAsFile 2017-05-03 15:01:15 +02:00
Eelco Dolstra 9b63bb88c8
nix-shell -p: Use runCommandCC 
This restores pre-17.03 behaviour by making gcc available.
 2017-04-24 12:04:01 +02:00
Neil Mayhew f12a048a05 Propagate NIX_BUILD_CORES to nix-shell environments 2017-04-09 08:21:52 -06:00
Stefan Junker f628ca2a1f nix-shell/pure: keep environment variable SHLVL 2017-03-12 01:04:21 +01:00
Eelco Dolstra d3e1aad421
nix-shell: Better error message when the shell can't be started 2017-02-24 17:25:00 +01:00
Eelco Dolstra 668fef2e4f
nix-shell: Overwrite environment variables 
Need to remember that std::map::insert() and emplace() don't overwrite
existing entries...

This fixes a regression relative to 1.11 that in particular triggers
in nested nix-shells.

Before:

  $ nativeBuildInputs=/foo nix-shell -p hello --run 'hello'
  build input /foo does not exist

After:

  $ nativeBuildInputs=/foo nix-shell -p hello --run 'hello'
  Hello, world!
 2017-02-24 13:31:46 +01:00
Eelco Dolstra 7a65b2470e
Restore default signal handling in child processes 
In particular, this fixes Ctrl-C in nix-shell sessions.
 2017-02-01 13:00:21 +01:00
Jude Taylor c0d55f9183 assign environ to a temp variable to ensure liveness 2017-01-16 23:52:44 +01:00
Eelco Dolstra 40dfac968a nix-build: Use showManPage() and printVersion() 2017-01-16 22:11:17 +01:00
Tuomas Tynkkynen 3890de049d nix-shell: Fix 'nix-shell --command' doing nothing without TTY 
Regression from a5f2750e ("Fix early removal of rc-file for nix-shell").
The removal of BASH_ENV causes nothing to be executed by bash if it
detects itself in a non-interactive context. Instead, just
use the same condition used by bash to launch bash differently.

According to bash sources, the condition (stdin and stder both
must be TTYs) is specified by POSIX so this should be pretty
safe to rely on.

Fixes #1171 on master, needs a backport to the Perl code in 1.11.
 2017-01-07 19:08:28 +02:00
Eelco Dolstra c287e797a8
nix-shell: In #! mode, pass the last argument 
"i < argc - 1" should be "i < argc".
 2017-01-03 11:40:51 +01:00
Tuomas Tynkkynen 018f884ffd nix-shell: Don't act interactive in shebangs 
I had observed that 'bash --rcfile' would do nothing in a
non-interactive context and cause nothing to be executed if a script
using nix-shell shebangs were run in a non-interactive context.
 2017-01-03 10:11:09 +02:00
Tuomas Tynkkynen c698ec1f22 nix-shell: Fix 'nix-shell -i' 
The 'args' variable here is shadowing one in the outer scope and its
contents end up unused. This causes any '#! nix-shell' lines to
effectively be ignored. The intention here was to clear the args vector,
as far as I can tell (and it seems to work).
 2017-01-03 10:11:09 +02:00
Eelco Dolstra 215b70f51e
Revert "Get rid of unicode quotes (#1140)" 
This reverts commit f78126bfd6. There
really is no need for such a massive change...
 2016-11-26 00:38:01 +01:00
Guillaume Maudoux f78126bfd6 Get rid of unicode quotes (#1140) 2016-11-25 15:48:27 +01:00
Eelco Dolstra 19c278de89 Fix Darwin build 
Done slightly differently from https://github.com/NixOS/nix/pull/1093.
 2016-10-19 15:21:18 +02:00
Eelco Dolstra 4546be1b3e nix-build, nix-shell: Don't print error message if nix-store/nix-instantiate fails 2016-09-21 16:54:53 +02:00
Eelco Dolstra 4de0639105 nix-shell: Fix $PATH handling in the impure case 
We were passing "p=$PATH" rather than "p=$PATH;", resulting in some
invalid shell code.

Also, construct a separate environment for the child rather than
overwriting the parent's.
 2016-09-20 15:41:41 +02:00
Eelco Dolstra 9fc4cb2ae9 nix-shell: Restore CPU affinity 
Otherwise the shell and its children will be bound to one CPU core...
 2016-09-20 15:41:41 +02:00
Eelco Dolstra e5949b5ce8 Fix build on GCC 4.9 
GCC 4.9 doesn't like reassigning a std::stringstream.

http://hydra.nixos.org/build/40371644
 2016-09-12 13:22:23 +02:00
Eelco Dolstra 5039d3b9de Write "T x" instead of "auto x = T" 
That's just silly. Hopefully this also fixes the Debian build failure:

http://hydra.nixos.org/build/40371644
 2016-09-12 12:06:13 +02:00
Shea Levy a5f2750ebb Fix early removal of rc-file for nix-shell 
BASH_ENV causes all non-interactive shells called via eg. /etc/bashrc to
remove the rc-file before the main shell gets to run it. Completion
scripts will often do this. Fixes #976.

Adapted from and fixes #1034.
 2016-09-08 09:09:52 -04:00
Shea Levy 821380c77b nix-build: Clean up a bit 2016-08-31 10:08:00 -04:00
Vladimír Čunát 1bffd83e1a nix-build: extend the meaning of $IN_NIX_SHELL 
An equivalent was originally filed against the perl version:
https://github.com/NixOS/nix/pull/933
 2016-08-11 17:14:09 +02:00
Shea Levy 80ebc553ec nix-build: Port to c++ 
This was a dumb line-for-line rewrite, because nix build/nix run/etc.
will replace it.
 2016-08-09 07:42:20 -04:00