6001 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Shea Levy	3fe9767dd3	Fix plugin tests on darwin	2018-02-13 12:49:14 -05:00
Eelco Dolstra	52c777a793	Merge pull request #1863 from shlevy/conf-includes ... Allow includes from nix.conf	2018-02-13 17:33:07 +01:00
Eelco Dolstra	7253113fd2	Merge pull request #1862 from shlevy/plugin-dirs ... Enable specifying directories in plugin-files.	2018-02-13 17:32:32 +01:00
Shea Levy	b8739f2fb3	Enable specifying directories in plugin-files.	2018-02-13 11:25:01 -05:00
Shea Levy	6eb1040e90	Allow includes from nix.conf	2018-02-13 08:16:32 -05:00
Eelco Dolstra	f471aacff2	Merge pull request #1775 from LnL7/darwin-build-users ... installer: create 'enough' build users	2018-02-13 12:31:53 +01:00
Eelco Dolstra	7828dca9e8	Merge branch 'register-constant' of https://github.com/shlevy/nix	2018-02-13 12:24:48 +01:00
Eelco Dolstra	1c10a74c73	Merge branch 'plugins' of https://github.com/shlevy/nix	2018-02-13 12:15:27 +01:00
Eelco Dolstra	c5cc57e962	Merge pull request #1859 from FRidh/flatten ... Nix stats: flatten statistics	2018-02-13 11:11:12 +01:00
Eelco Dolstra	9bcb4d2dd9	Fix hang in build-remote	2018-02-12 22:48:55 +01:00
Eelco Dolstra	4f09ce7940	Fix 'deadlock: trying to re-acquire self-held lock' ... This was caused by derivations with 'allowSubstitutes = false'. Such derivations will be built locally. However, if there is another SubstitionGoal that has the output of the first derivation in its closure, then the path will be simultaneously built and substituted. There was a check to catch this situation (via pathIsLockedByMe()), but it no longer worked reliably because substitutions are now done in another thread. (Thus the comment 'It can't happen between here and the lockPaths() call below because we're not allowing multi-threading' was no longer valid.) The fix is to handle the path already being locked in both SubstitutionGoal and DerivationGoal.	2018-02-12 17:06:06 +01:00
Eelco Dolstra	35fd31770c	toBuildables -> build	2018-02-12 17:06:06 +01:00
Will Dietz	c6209030c4	compression: make parallel sink separate class	2018-02-11 13:50:28 -06:00
Will Dietz	a0bdc96726	compression: print warning if parallel requested but not supported	2018-02-11 13:03:47 -06:00
Frederik Rietdijk	60eca58533	Nix stats: flatten statistics ... Flattens the list of statistics as suggested in https://github.com/NixOS/ofborg/issues/67. This makes it easier to work with.	2018-02-11 14:37:50 +01:00
Will Dietz	5a082ad15a	configure.ac: check if lzma has MT support, fix deb build/etc.	2018-02-09 21:02:25 -06:00
Eelco Dolstra	960e9c560e	nix: Ensure that the user sees errors from substituters	2018-02-09 15:06:47 +01:00
Eelco Dolstra	aa02cdc33c	getDefaultSubstituters(): Skip broken substituters ... Fixes #1340.	2018-02-09 15:06:47 +01:00
Eelco Dolstra	3d2d207aad	Merge pull request #1848 from AmineChikhaoui/parallel-xz ... support multi threaded xz encoder	2018-02-09 15:03:25 +01:00
Shea Levy	081f14a169	Allow using RegisterPrimop to define constants. ... This enables plugins to add new constants, as well as new primops.	2018-02-08 14:35:50 -05:00
Shea Levy	88cd2d41ac	Add plugins to make Nix more extensible. ... All plugins in plugin-files will be dlopened, allowing them to statically construct instances of the various Register* types Nix supports.	2018-02-08 12:44:37 -05:00
Eelco Dolstra	ad97a21834	nix-env: Fix parsing of --system ... https://hydra.nixos.org/build/68827814	2018-02-08 15:25:03 +01:00
Eelco Dolstra	444bae44ef	dsa -> ed25519 ... DSS is disabled by default in NixOS 18.03. https://hydra.nixos.org/build/68788560	2018-02-08 13:46:23 +01:00
AmineChikhaoui	0685a6480a	Merge branch 'master' of https://github.com/NixOS/nix into parallel-xz	2018-02-08 12:24:48 +01:00
Will Dietz	c7e0be1bfc	build-dry: disable failing portion of test until issue is fixed	2018-02-07 15:20:54 -06:00
Will Dietz	98031b6050	nix build: Don't create output links with --dry-run. ... Fixes #1849.	2018-02-07 15:20:54 -06:00
Will Dietz	3780435a0e	tests: Add (failing) tests for reported --dry-run issues.	2018-02-07 15:20:54 -06:00
Will Dietz	f201b7733e	More completely fix recursive nix, unbreak tests ... See: 88b5d0c8e8 (commitcomment-27406365)	2018-02-07 15:19:28 -06:00
AmineChikhaoui	a56637205a	Merge branch 'master' of https://github.com/NixOS/nix into parallel-xz	2018-02-07 21:09:04 +01:00
AmineChikhaoui	47ad88099b	move the parallel-compression setting to binary-cache-store, the setting ... can be done now from the url e.g s3://nix-cache?parallel-compression=1 instead of nix.conf.	2018-02-07 21:06:11 +01:00
Eelco Dolstra	88b5d0c8e8	Prevent accidental recursive Nix	2018-02-07 19:07:38 +01:00
AmineChikhaoui	55ecdfe2a8	make multi threaded compression configurable and use single threaded ... by default.	2018-02-07 17:54:08 +01:00
AmineChikhaoui	163e39547a	Merge branch 'master' of https://github.com/NixOS/nix into parallel-xz	2018-02-07 17:53:50 +01:00
Shea Levy	48c192ca2d	builtins.path test: Don't rely on shlevy's XDG_RUNTIME_DIR	2018-02-07 10:26:53 -05:00
Eelco Dolstra	84989d3af2	Improve filtering of ANSI escape sequences in build logs ... All ANSI sequences except color setting are now filtered out. In particular, terminal resets (such as from NixOS VM tests) are filtered out. Also, fix the completely broken tab character handling.	2018-02-07 15:23:57 +01:00
Eelco Dolstra	cfdfad5c34	Simplify	2018-02-07 14:15:20 +01:00
Eelco Dolstra	0f3dae1064	Merge branch 'fix-aarch64-test' of https://github.com/grahamc/nix	2018-02-07 14:12:15 +01:00
Eelco Dolstra	abe6be578b	Merge pull request #1816 from shlevy/add-path ... Add path primop.	2018-02-07 13:32:35 +01:00
AmineChikhaoui	9d1e22f743	set block size to 0 to let the lzma lib choose the right one, add ... some comments about possible improvements wrt memory usage/threading.	2018-02-07 11:18:55 +01:00
Shea Levy	69d82e5c58	Add path primop. ... builtins.path allows specifying the name of a path (which makes paths with store-illegal names now addable), allows adding paths with flat instead of recursive hashes, allows specifying a filter (so is a generalization of filterSource), and allows specifying an expected hash (enabling safe path adding in pure mode).	2018-02-06 16:48:08 -05:00
AmineChikhaoui	bc7e3a4dd6	support multi threaded xz encoder, this might be particularly useful in ... the case of hydra where the overhead of single threaded encoding is more noticeable e.g most of the time spent in "Sending inputs"/"Receiving outputs" is due to compression while the actual upload to the binary cache seems to be negligible.	2018-02-06 22:42:02 +01:00
Eelco Dolstra	6f6bfc8205	Update the progress bar at most 20 times per second ... Fixes #1834.	2018-02-06 20:51:37 +01:00
Shea Levy	694b6d229b	Merge branch 'fix/busybox-sandbox-shell-attribute' of git://github.com/dtzWill/nix	2018-02-06 14:01:22 -05:00
Eelco Dolstra	43f8ef73c6	realiseContext(): Add derivation outputs to the allowed paths ... This makes import-from-derivation work in restricted mode again.	2018-02-06 15:38:45 +01:00
Eelco Dolstra	f24e726ba5	checkURI(): Check file URIs against allowedPaths ... This makes e.g. 'fetchGit ./.' work (assuming that ./. is an allowed path).	2018-02-06 14:35:33 +01:00
Eelco Dolstra	f539085e65	Fix evaluation	2018-02-05 21:48:09 +01:00
Will Dietz	47dc6076af	release-common: use shell from nixpkgs, provide fallback for compat	2018-02-05 11:33:18 -06:00
Eelco Dolstra	55012ec0b9	Tweak progress bar message ... Say "copying" instead of "fetching" when copying from another local store. Nice for nixos-install.	2018-02-05 18:32:23 +01:00
Eelco Dolstra	bb1d046f5c	Allow substituters to be marked as trusted ... This is needed by nixos-install, which uses the Nix store on the installation CD as a substituter. We don't want to disable signature checking entirely because substitutes from cache.nixos.org should still be checked. So now we can pas "local?trusted=1" to mark only the Nix store in /nix as not requiring signatures. Fixes #1819.	2018-02-05 18:08:30 +01:00
Eelco Dolstra	2175eee9fe	Fix segfault using non-binary cache stores as substituters	2018-02-05 17:46:43 +01:00