Eelco Dolstra
b0b81b7500
Merge pull request #1366 from Mic92/fix-nix-daemon-service
...
nix-daemon.service: fix startup
2017-05-01 11:16:56 +02:00
Eelco Dolstra
8b039ba74f
Merge branch 'remove-catchall' of https://github.com/layus/nix
2017-05-01 11:16:04 +02:00
Guillaume Maudoux
a143014d73
lexer: remove catch-all rules hiding real errors
...
With catch-all rules, we hide potential errors.
It turns out that a4744254
2017-05-01 01:18:06 +02:00
Guillaume Maudoux
a474425425
Fix lexer to support $' in multiline strings.
2017-05-01 01:15:40 +02:00
b3f55fdf62
nix-daemon.service: set XDG_CONFIG_HOME
...
Otherwise starting nix-daemon fails
● nix-daemon.service - Nix Daemon
Loaded: loaded
(/nix/store/mnf00a6gc55xl47smk0b32gmi7xpvlfp-nix-1.12pre5308_2f21d522/lib/systemd/system/nix-daemon.service;
enabled; vendor preset: enabled)
Drop-In:
/nix/store/m2rgjp71n4kyp8j5fxgbrlv13scd5vvv-system-units/nix-daemon.service.d
└─overrides.conf
Active: failed (Result: exit-code) since Sat 2017-04-29 11:29:21
CEST; 9s ago
Process: 7299 ExecStart=nix-daemon --daemon (code=exited, status=1/FAILURE)
Main PID: 7299 (code=exited, status=1/FAILURE)
CPU: 19ms
... systemd[1]: Started Nix Daemon.
... nix-daemon[7299]: error: $XDG_CONFIG_HOME and $HOME are not set
... systemd[1]: nix-daemon.service: Main process exited, code=exited, status=1/FAILURE
... systemd[1]: nix-daemon.service: Unit entered failed state.
... systemd[1]: nix-daemon.service: Failed with result 'exit-code'.
... systemd[1]: nix-daemon.service: Start request repeated too quickly.
... systemd[1]: Failed to start Nix Daemon.
... systemd[1]: nix-daemon.service: Failed with result 'exit-code'.
2017-04-29 11:33:55 +02:00
Eelco Dolstra
2f21d522c2
Hopefully fix the Darwin build
...
http://hydra.nixos.org/build/52080911
2017-04-28 17:13:55 +02:00
Eelco Dolstra
895f00c372
Suppress warning about ssh-auth-sock
2017-04-28 16:55:52 +02:00
Eelco Dolstra
73bba12d8b
Check for libreadline
2017-04-28 16:53:56 +02:00
Eelco Dolstra
a1a5e63e14
Fix brainfart
2017-04-28 16:21:54 +02:00
Eelco Dolstra
41c4558afe
Fix hash computation when importing NARs greater than 4 GiB
...
This caused "nix-store --import" to compute an incorrect hash on NARs
that don't fit in an unsigned int. The import would succeed, but
"nix-store --verify-path" or subsequent exports would detect an
incorrect hash.
A deeper issue is that the export/import format does not contain a
hash, so we can't detect such issues early.
Also, I learned that -Wall does not warn about this.
2017-04-28 15:24:05 +02:00
Eelco Dolstra
39b08f4c0c
Merge pull request #1358 from shlevy/store-nesting
...
Add Store nesting to fix import-from-derivation within filterSource
2017-04-26 20:28:49 +02:00
Shea Levy
4bc00760f9
Add Store nesting to fix import-from-derivation within filterSource
2017-04-26 14:15:47 -04:00
Eelco Dolstra
45ce2c7413
Doh
2017-04-26 17:58:09 +02:00
Eelco Dolstra
98a2adb135
Simplify building nix-perl in nix-shell
2017-04-26 17:04:45 +02:00
Eelco Dolstra
6734c18c99
nix repl: Fix Ctrl-C
2017-04-25 19:19:48 +02:00
Eelco Dolstra
23aa1619da
Minor cleanup
2017-04-25 19:10:47 +02:00
Eelco Dolstra
4c95ef3768
Fix nix-shell test
2017-04-25 18:59:18 +02:00
Eelco Dolstra
536f061765
"using namespace std" considered harmful
2017-04-25 18:58:02 +02:00
Eelco Dolstra
5bd8795e1f
nix repl: Use $XDG_DATA_HOME for the readline history
2017-04-25 18:56:29 +02:00
Eelco Dolstra
921a2aeb05
Make "nix repl" build
2017-04-25 18:48:40 +02:00
Eelco Dolstra
c31000bc93
Merge nix-repl repository
2017-04-25 18:14:13 +02:00
Eelco Dolstra
40daf0d800
Cleanup in preparation of merging nix-repl repo into nix repo
2017-04-25 18:13:23 +02:00
Eelco Dolstra
fee93541a4
Merge branch 'master' of https://github.com/olejorgenb/nix-repl
2017-04-25 16:57:07 +02:00
Eelco Dolstra
2dff9556a4
Fix build
2017-04-25 16:55:03 +02:00
Eelco Dolstra
c30330df6f
StorePathCommands: Build installables
...
So for instance "nix copy --to ... nixpkgs.hello" will build
nixpkgs.hello first. It's debatable whether this is a good idea. It
seems desirable for commands like "nix copy" but maybe not for
commands like "nix path-info".
2017-04-25 16:19:22 +02:00
Eelco Dolstra
d48c973ece
Set default installable
...
Thus
$ nix build -f foo.nix
will build foo.nix.
And
$ nix build
will build default.nix. However, this may not be a good idea because
it's kind of inconsistent, given that "nix build foo" will build the
"foo" attribute from the default installation source (i.e. the
synthesis of $NIX_PATH), rather than ./default.nix. So I may revert
this.
2017-04-25 15:18:05 +02:00
Eelco Dolstra
0b6220fbd6
Interpret any installable containing a slash as a path
...
So "nix path-info ./result" now works.
2017-04-25 14:09:01 +02:00
Eelco Dolstra
7ee81f3887
Make StorePathsCommand a subclass of InstallablesCommand
...
This allows commands like 'nix path-info', 'nix copy', 'nix verify'
etc. to work on arbitrary installables. E.g. to copy geeqie to a
binary cache:
$ nix copy -r --to file:///tmp/binary-cache nixpkgs.geeqie
Or to get the closure size of thunderbird:
$ nix path-info -S nixpkgs.thunderbird
2017-04-25 13:20:26 +02:00
Eelco Dolstra
c769841bc4
Move code around
2017-04-25 12:07:31 +02:00
Eelco Dolstra
6267d74889
Add "nix eval" command
...
This replaces "nix-instantiate --eval". The result is evaluated
strictly since this seems more useful.
2017-04-25 11:23:47 +02:00
Eelco Dolstra
bcecc99007
Restructure installables handling in the "nix" command
2017-04-25 11:20:37 +02:00
Eelco Dolstra
1bb87c0487
Remove debug statement
2017-04-24 15:01:28 +02:00
Eelco Dolstra
66577a1c64
Factor out --json
2017-04-24 14:21:36 +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
Eelco Dolstra
1196470e92
Merge pull request #1347 from kennyballou/sm-grammar-fix
...
Fix small grammar issue about page
2017-04-24 10:49:46 +02:00
Eelco Dolstra
240399e059
Merge pull request #1351 from earldouglas/ellipses
...
Drop misleading ellipses
2017-04-24 10:49:09 +02:00
Eelco Dolstra
8d6af08530
Merge pull request #1348 from armijnhemel/nix-env
...
better document --meta option for nix-env
2017-04-24 10:18:23 +02:00
Eelco Dolstra
169edf9407
Merge pull request #1352 from corngood/cygwin-fixes
...
Cygwin fixes
2017-04-21 17:39:33 +02:00
David McFarland
804ac52489
add helper function to set 'interruptThrown'
...
this fixes a linker failure on cygwin 64 due to some bad
interaction between tls and shared libraries.
see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64697
2017-04-21 11:28:14 -03:00
David McFarland
d35231ec60
set _GNU_SOURCE on cygwin
...
this is needed for pipe2()
2017-04-21 11:27:27 -03:00
James Earl Douglas
111d347237
Drop misleading ellipses
...
This portion of the quick start guide may lead to confusion for
newcomers to Nix. This change clarifies the example to one that can be
copied in its entirety.
2017-04-20 18:07:23 -06:00
Eelco Dolstra
749696e71c
Detect lsof
...
Also, don't use lsof on Linux since it's not needed.
Fixes #1328 .
2017-04-20 19:11:45 +02:00
Eelco Dolstra
efa4bdbfcd
Improve nix show-config --json
...
In particular, show descriptions. This could be used for manpage
generation etc.
2017-04-20 17:34:47 +02:00
Eelco Dolstra
4410e9d995
Setting: Remove "Tag" template argument
2017-04-20 16:52:53 +02:00
Eelco Dolstra
f05d5f89ff
Read per-user settings from ~/.config/nix/nix.conf
2017-04-20 14:58:16 +02:00
Eelco Dolstra
562585e901
binary-caches-parallel-connections -> http-connections
2017-04-20 14:04:00 +02:00
Eelco Dolstra
4222402219
nix.conf man page: binary-caches -> substituters
2017-04-20 13:41:29 +02:00
Eelco Dolstra
76cb3c702c
Reimplement trusted-substituters (aka trusted-binary-caches)
2017-04-20 13:41:29 +02:00
Armijn Hemel
1559c596f6
document option
2017-04-19 19:10:12 +02:00
kballou
00b6c6d0c3
Fix small grammar issue about page
...
Fix subject-verb agreement issue in introduction/about.
2017-04-19 09:27:28 -06:00
