899 commits

Author	SHA1	Message	Date
John Ericson	80e335bb58	Use drvPath2 and give it a better name	2020-09-28 15:43:56 +00:00
John Ericson	10202bbf29	Merge remote-tracking branch 'upstream/master' into ca-floating-upstream	2020-09-28 15:39:11 +00:00
Eelco Dolstra	649c465873	Merge pull request #4064 from serokell/balsoft/fix-max-jobs ... Fix max-jobs option	2020-09-28 10:42:02 +02:00
Eelco Dolstra	7d81582488	Merge pull request #3953 from obsidiansystems/basic-derivation-goal-outputs ... Deduplicate basic derivation goals too	2020-09-25 17:21:19 +02:00
Alexander Bantyev	ed218e1d6c	Fix max-jobs option ... After 0ed946aa61, max-jobs setting (-j/--max-jobs) stopped working. The reason was that nrLocalBuilds (which compared to maxBuildJobs to figure out whether the limit is reached or not) is not incremented yet when tryBuild is started; So, the solution is to move the check to tryLocalBuild. Closes https://github.com/nixos/nix/issues/3763	2020-09-25 00:07:42 +03:00
Eelco Dolstra	4ce8a3ed45	Hopefully fix EPERM on macOS	2020-09-23 21:29:10 +02:00
Eelco Dolstra	9a24ece122	Fix exception	2020-09-23 20:21:08 +02:00
Eelco Dolstra	236d9ee7f7	lstat() cleanup	2020-09-23 19:17:28 +02:00
Eelco Dolstra	688bd4fb50	After rewriting a path, make it read-only	2020-09-23 19:10:16 +02:00
Eelco Dolstra	cec9473871	DerivationGoal::registerOutputs(): Don't canonicalize twice ... Fixes #4021.	2020-09-23 18:21:22 +02:00
Eelco Dolstra	e8f0b1e996	DerivationGoal::registerOutputs(): Fix bad format string	2020-09-23 18:21:22 +02:00
John Ericson	993229cdaf	Deduplicate basic derivation goals too ... See comments for security concerns. Also optimize goal creation by not traversing map twice.	2020-09-22 17:13:59 +00:00
regnat	67cc356bb3	Merge remote-tracking branch 'origin/master' into non-ca-depending-on-ca	2020-09-22 16:11:25 +02:00
Eelco Dolstra	92ac8df0ec	Merge branch 'add-ca-to-store' of https://github.com/hercules-ci/nix	2020-09-22 11:31:33 +02:00
John Ericson	3786a801c3	Merge remote-tracking branch 'upstream/master' into ca-floating-upstream	2020-09-22 04:15:55 +00:00
Eelco Dolstra	d51ba43047	Move Callback into its own header ... This gets rid of the inclusion of <future> in util.hh, cutting compilation time by ~20s (CPU time). Issue #4045.	2020-09-21 18:42:21 +02:00
Robert Hensing	ca30abb3fb	Document addCAToStore/addToStoreFromDump source drainage ... Also checked that all usages satisfy the requirement and removed dead code.	2020-09-21 07:55:47 +02:00
John Ericson	b7df353f27	Merge remote-tracking branch 'upstream/master' into ca-floating-upstream	2020-09-17 16:33:10 +00:00
John Ericson	2741fffa35	Ensure resolved CA derivations are written ... so we can link outputs to deriver and thus properly cache.	2020-09-16 17:57:32 +00:00
John Ericson	7fdbb377ba	Start to fix floating CA + remote building	2020-09-16 17:50:48 +00:00
John Ericson	c5ccebae00	Merge remote-tracking branch 'upstream/master' into ca-floating-upstream	2020-09-16 17:50:40 +00:00
regnat	b73adacc1e	Add a name to the stores ... So that it can be printed by `nix describe-stores`	2020-09-16 13:53:09 +02:00
regnat	f24f0888f9	Document the new store hierarchy	2020-09-16 13:53:09 +02:00
regnat	5895184df4	Correctly call all the parent contructors of the stores ... Using virtual inheritance means that only the default constructors of the parent classes will be called, which isn't what we want	2020-09-16 13:53:09 +02:00
John Ericson	3a5cdd737c	Rename Derivation::pathOpt to Derivation::path ... We no longer need the `*Opt` to disambiguate.	2020-09-15 15:21:39 +00:00
John Ericson	6387550d58	Get rid of confusing std::optional<bool> for validity	2020-09-15 15:19:45 +00:00
John Ericson	c4bf219b55	Don't link deriver until after any delayed exception is thrown ... Otherwise, we will associate fixed-output derivations with outputs that they did indeed produce, but which had the wrong hash. That's no good.	2020-09-15 14:28:06 +00:00
John Ericson	075d399e3f	Merge remote-tracking branch 'obsidian/single-ca-drv-build' into ca-floating-upstream	2020-09-04 16:04:35 +00:00
John Ericson	e9fad3006b	Fix some of the issues raised by @edolstra ... - More and better comments - The easier renames	2020-09-04 15:18:25 +00:00
John Ericson	e86dd59dcc	Apply suggestions from code review ... Thanks! Co-authored-by: Eelco Dolstra <edolstra@gmail.com>	2020-09-04 10:48:50 -04:00
John Ericson	c9f1ed912c	Don't chmod symlink before moving outputs around ... Co-authored-by: Théophane Hufschmitt <regnat@users.noreply.github.com>	2020-09-04 14:41:53 +00:00
John Ericson	aad4abcc9c	Fix floating CA tests ... We will sometimes try to query the outputs of derivations we can't resolve. That's fine; it just means we don't know what those outputs are yet.	2020-09-04 01:17:38 +00:00
John Ericson	421ed527c7	Update src/libstore/build.cc ... Thanks for catching, @regnat.	2020-08-28 17:22:57 -04:00
John Ericson	8eb73a8724	CA derivations that depend on other CA derivations ... Co-authored-by: Théophane Hufschmitt <regnat@users.noreply.github.com>	2020-08-24 19:01:15 +00:00
John Ericson	59979e7053	Fix bad debug format string	2020-08-24 19:01:07 +00:00
John Ericson	45a2f1baab	Rename drv output querying functions, like master ... - `queryDerivationOutputMapAssumeTotal` -> `queryPartialDerivationOutputMap` - `queryDerivationOutputMapAssumeTotal` -> `queryDerivationOutputMap	2020-08-20 18:14:12 +00:00
John Ericson	3c8b5b6219	Merge remote-tracking branch 'upstream/master' into single-ca-drv-build	2020-08-14 17:00:13 +00:00
Eelco Dolstra	13e49be660	Merge pull request #3875 from obsidiansystems/new-interface-for-path-pathOpt ... Offer a safer interface for path and pathOpt	2020-08-14 17:19:19 +02:00
Eelco Dolstra	7714d9a943	Merge pull request #3924 from obsidiansystems/features-per-store ... Make `system-features` a store setting	2020-08-14 17:13:07 +02:00
Eelco Dolstra	d81f13f7cb	Merge pull request #3899 from obsidiansystems/make-narHash-not-optional ... Make narHash in ValidPathInfo not optional	2020-08-14 17:00:18 +02:00
John Ericson	4720853129	Make system-features a store setting ... This seems more correct. It also means one can specify the features a store should support with --store and remote-store=..., which is useful. I use this to clean up the build remotes test.	2020-08-12 18:13:00 +00:00
John Ericson	8d4162ff9e	Separate auth and logic for the daemon ... Before, processConnection wanted to know a user name and user id, and `nix-daemon --stdio`, when it isn't proxying to an underlying daemon, would just assume "root" and 0. But `nix-daemon --stdio` (no proxying) shouldn't make guesses about who holds the other end of its standard streams. Now processConnection takes an "auth hook", so `nix-daemon` can provide the appropriate policy and daemon.cc doesn't need to know or care what it is.	2020-08-12 15:22:33 +00:00
John Ericson	5f80aea795	Break out lambda so output can be matched just once ... This is much better.	2020-08-12 02:23:31 +00:00
John Ericson	18834f7764	Recheck path validity after acquiring lock ... It might have changed, and in any event this is how the cod used to work so let's just keep it.	2020-08-11 23:44:02 +00:00
John Ericson	2de201254e	Don't assume a total output map in two places in build.cc ... Thanks @regnat for catching one of them. The other follows for many of the same reasons. I'm find fixing others on a need-to-fix basis, provided their are no regressions.	2020-08-11 23:07:50 +00:00
John Ericson	4c6aac8fdf	Clarify comment on sandbox and temp fresh paths	2020-08-11 22:46:05 +00:00
John Ericson	6d57139050	Clarify outputReferences variable with self-describing type ... Thanks for the idea, @Regnat!	2020-08-11 22:34:09 +00:00
John Ericson	8a068bd025	Remove redundant equality check	2020-08-11 21:25:40 +00:00
John Ericson	07e3466eb4	Float comment to out describe gaveUpOnSubstitution in general	2020-08-11 21:16:14 +00:00
John Ericson	d0f6e338dd	Apply suggestions from code review ... Thanks!! Co-authored-by: Théophane Hufschmitt <regnat@users.noreply.github.com>	2020-08-11 16:49:10 -04:00