7340 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Eelco Dolstra	338f29dbd4	nix ls-{nar,store}: Return offset of files in the NAR if known ... E.g. $ nix ls-store --json --recursive --store https://cache.nixos.org /nix/store/b0w2hafndl09h64fhb86kw6bmhbmnpm1-blender-2.79 \ | jq .entries.bin.entries.blender.narOffset 400	2017-12-07 01:07:07 +01:00
Eelco Dolstra	ba334bd6f7	Merge pull request #1714 from LnL7/fix-ssh-store-nar ... ssh-store: fix length when writing nar	2017-12-06 13:11:36 +01:00
Daiderd Jordan	2cb8aaa610	ssh-store: fix length when writing nar ... This fixes nix copy and other things that use copyStorePath.	2017-12-06 11:41:08 +01:00
Shea Levy	11a7f8ce14	Merge branch 'fetchGit-fast-revision-update'	2017-12-05 11:16:39 -05:00
Eelco Dolstra	7f2c324ed1	Simplify build by including nlohmann/json.hpp	2017-12-04 17:11:36 +01:00
Eelco Dolstra	f1efb97075	Fix #1635.	2017-12-04 13:19:16 +01:00
Will Dietz	79f5c296c0	ignore "interrupted" exception in progress callback ... Context/discusson: https://github.com/NixOS/nix/issues/1692#issuecomment-348282301	2017-11-30 12:45:54 -06:00
Eelco Dolstra	cd74a55afc	Merge pull request #1704 from lheckemann/buildenv-eol-fix ... Fix "Unexpected EOF reading a line" error	2017-11-29 15:27:57 +01:00
Linus Heckemann	f986a44980	Fix "Unexpected EOF reading a line" error ... propagated-user-env-packages files in nixpkgs aren't all terminated by newlines, as buildenv expected. Now it does not require a terminating newline; note that this introduces a behaviour change: propagated user env packages may now be spread across multiple lines. However, nix 1.11.x still expects them to be on a single line so this shouldn't be used in nixpkgs for now.	2017-11-29 11:56:15 +00:00
Eelco Dolstra	b52846ab5b	Show log tail when a remote build fails	2017-11-28 15:36:28 +01:00
Will Dietz	e50d7335bf	doc: linenoise -> linenoise-ng	2017-11-27 18:36:20 -06:00
Will Dietz	964349e44d	no "linenoiseFree" in linenoise-ng	2017-11-27 18:30:05 -06:00
Will Dietz	21f515724c	replace vendored linenoise with linenoise-ng	2017-11-27 18:27:28 -06:00
Eelco Dolstra	3c470c97a1	Merge pull request #1699 from aszlig/fix-remote-build-log ... build-remote: Fix missing log output	2017-11-27 13:59:51 +01:00
aszlig	6567ab95a0	build-remote: Fix missing log output ... The storeUri variable in the build-remote hook is declared very much to the start of the main function and a bunch of lines later, the same variable gets checked via hasPrefix() but it gets assigned *after* that check when the most suitable machine for the build was choosen. So I guess this was just a typo in d16fd24973 and what we really want is to either checkd the prefix *after* assigning storeUri or use bestMachine->storeUri directly. I choose the latter, because the former could introduce even more regressions if the try block where the variable gets assigned terminates early. Nevertheless, the reason why the log output didn't work is because hasPrefix() checked for "ssh://" in front of storeUri, but if the storeUri isn't set correctly (or at all), we don't get the log file descriptor set up properly, leading to no log output. I've adjusted the remote-builds test to include a regression test for this, so that we can make sure we get a build output when using remote builds. In addition to that I've tested this with two of my build farms and the build logs are emitted correctly again. Signed-off-by: aszlig <aszlig@nix.build>	2017-11-25 01:34:18 +01:00
Eelco Dolstra	549c3706a5	nix path-info: Show URL of NARs in binary caches	2017-11-24 18:08:50 +01:00
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
Shea Levy	eedbc4e06c	fetchGit: Ignore tarballTtl if rev is set and not in the repo. ... Fixes #1697.	2017-11-24 06:09:24 -05:00
Eelco Dolstra	0fc3e581e0	tests/run.sh: Fix /build conflict when building in a sandbox ... https://hydra.nixos.org/build/64519355	2017-11-21 19:43:12 +01:00
Eelco Dolstra	d7da6c9ea9	fetchGit/fetchMercurial: Fix directory inclusion check ... E.g. the existence of .gitignore would cause .git to be included.	2017-11-21 19:34:46 +01:00
Eelco Dolstra	6cdaa858d0	Propagate flags like --sandbox to the daemon properly	2017-11-21 18:50:56 +01:00
Eelco Dolstra	7536fe31dd	Add a warning about the 'trusted-users' option	2017-11-21 18:49:52 +01:00
Eelco Dolstra	4fcf44825f	Add tests for verifying/copying content-addressed paths ... These don't require signatures.	2017-11-20 19:11:02 +01:00
Eelco Dolstra	0c9718aabc	Add tests for signature checking when copying between local stores	2017-11-20 19:02:57 +01:00
Eelco Dolstra	8df60b4ea8	Document secret-key-files	2017-11-20 18:51:04 +01:00
Eelco Dolstra	4cde04f476	Add tests for "nix run"	2017-11-20 18:36:36 +01:00
Eelco Dolstra	f5f29dc2b7	nix eval --raw: Use coerceToString() ... Thus, $ nix eval --raw '("foo")' foo $ nix eval --raw nixpkgs.hello /nix/store/1y6ckg6khrdsvll54s5spcmf3w6ka9k4-hello-2.10 $ nix eval --raw '(/etc/resolv.conf)' /nix/store/vml92ama92i8mz013nny461mlvg8mvap-resolv.conf	2017-11-20 18:27:29 +01:00
Eelco Dolstra	1ff01187e2	nix run: Fix "flag '--command' requires 2 argument(s)"	2017-11-20 18:07:58 +01:00
Eelco Dolstra	4eb9e20028	nix run: Fix accidental removal of /nix/store existence check ... Parenthetical to #1686, we don't need to create a new root if we can just bind-mount on top of the existing /nix/store.	2017-11-20 17:59:32 +01:00
Eelco Dolstra	a3aa850f0f	nix run: Ignore non-directories while setting up the chroot ... Fixes #1686.	2017-11-20 17:58:47 +01:00
Eelco Dolstra	193330d321	Test: Replace --option with the corresponding flag	2017-11-20 17:50:49 +01:00
Eelco Dolstra	91a1987607	signed-binary-caches -> require-sigs ... Unlike signed-binary-caches (which could only be '*' or ''), require-sigs is a proper Boolean option. The default is true.	2017-11-20 17:44:07 +01:00
Eelco Dolstra	d0b88db441	Cleanup	2017-11-20 17:32:58 +01:00
Eelco Dolstra	7a2b64e55c	binary-cache-public-keys -> trusted-public-keys ... The name had become a misnomer since it's not only for substitution from binary caches, but when adding/copying any (non-content-addressed) path to a store.	2017-11-20 17:32:34 +01:00
Eelco Dolstra	ea94a87493	install-darwin-multi-user.sh: Remove superfluous nix.conf settings	2017-11-20 17:32:34 +01:00
Eelco Dolstra	72804dc0bd	Merge pull request #1645 from twhitehead/stat-race ... Fix (highly unlikely) race condition in readLink	2017-11-20 17:32:27 +01:00
Eelco Dolstra	7474ac871b	nix copy: Abbreviate "daemon"	2017-11-20 15:17:11 +01:00
Eelco Dolstra	8956ae1987	Add a "profile" option to S3BinaryCacheStore ... This allows specifying the AWS configuration profile to use. E.g. nix copy --from s3://my-cache?profile=aws-dev-account /nix/store/cf3isrlqavvd5w7rpky1fa8j9lcnlggm-...	2017-11-15 14:18:20 +01:00
Eelco Dolstra	897ca33a1c	Merge pull request #1678 from dtzWill/feature/anchor-exit-exception ... anchor nix::Exit exception	2017-11-15 12:31:47 +01:00
Eelco Dolstra	27131866c9	Doh	2017-11-15 12:23:31 +01:00
Will Dietz	9d7ce0bf45	anchor nix::Exit exception	2017-11-14 12:39:30 -06:00
Eelco Dolstra	2f5789c5d6	Add dependencies for coverage test	2017-11-14 18:47:44 +01:00
Eelco Dolstra	4b45d8c95a	Update lcov filter	2017-11-14 18:47:37 +01:00
Eelco Dolstra	ec5b04862b	nix sign-paths: Support binary caches	2017-11-14 18:44:05 +01:00
Eelco Dolstra	d6dbda7004	Add tests for "nix verify", "nix sign-paths" etc.	2017-11-14 18:24:20 +01:00
Eelco Dolstra	2c39e4eca0	Revert "Don't parse "x:x" as a URI" ... This reverts commit f90f660b24. This broke Hydra's release.nix, which contained preCheck = ''export LOGNAME=${LOGNAME:-foo}'';	2017-11-14 15:10:52 +01:00
Eelco Dolstra	5773d667ee	nix ls-{nar,store}: Don't abort on missing files	2017-11-14 14:49:06 +01:00
Eelco Dolstra	b8d446829e	Add some tests	2017-11-14 14:37:39 +01:00
Eelco Dolstra	4db0a9555e	nix ls-{nar,store} --json: Respect -R	2017-11-14 14:31:38 +01:00
Eelco Dolstra	c8155e9f5f	Don't indent JSON output	2017-11-14 14:28:03 +01:00