Eelco Dolstra
20a7d8d23a
Add some missing clean-files
2020-10-18 20:32:59 +02:00
Eelco Dolstra
93bd014c8c
Update .gitignore
2020-10-18 20:32:46 +02:00
Eelco Dolstra
fda835b231
Merge pull request #4143 from obsidiansystems/typed-goal-maps
...
Properly type the derivation and substitution goal maps
2020-10-18 18:12:21 +02:00
Eelco Dolstra
6bca8f82c7
Merge pull request #4157 from SFrijters/doc-nix-shell-pure-bashrc
...
doc: nix-shell in pure mode does *not* source user bashrc
2020-10-18 18:10:18 +02:00
Eelco Dolstra
67cc94b80b
Merge pull request #4158 from hercules-ci/issue-3964-substitution-loop
...
Fix substitution loop #3964 , #3534
2020-10-18 18:09:11 +02:00
Robert Hensing
bd9eb5c743
DerivationGoal: only retry if output closure incomplete is only problem
2020-10-18 14:26:37 +02:00
Robert Hensing
ea8d32020e
Tests for #3964
2020-10-18 14:26:37 +02:00
Robert Hensing
94f1e4a441
Typo
2020-10-18 14:26:37 +02:00
Stefan Frijters
a53438d18f
doc: nix-shell in pure mode does *not* source user bashrc
2020-10-18 14:26:05 +02:00
John Ericson
7ed46c1574
Explain that upcast_goal
is still a static cast
2020-10-17 21:50:12 +00:00
John Ericson
57d0432b39
Just use auto
in two places.
2020-10-17 21:47:52 +00:00
John Ericson
e6f8ae56d8
tab -> space
2020-10-17 21:45:31 +00:00
John Ericson
619d262c97
Merge remote-tracking branch 'upstream/master' into typed-goal-maps
2020-10-17 21:44:27 +00:00
Eelco Dolstra
05e6fe69f9
Merge pull request #4156 from aszlig/vm-test-python
...
Convert VM tests to Python
2020-10-17 23:40:44 +02:00
aszlig
cfa26cf181
tests: Add names to VM tests
...
Having vm-test-run-unnamed for all the test derivation doesn't look very
nice, so in order to better distinguish them from their store path,
let's actually give them proper names.
Signed-off-by: aszlig <aszlig@nix.build>
2020-10-17 23:34:38 +02:00
aszlig
5cfdf16dd6
Convert VM tests to Python
...
Perl-based tests are deprecated since NixOS 20.03 and subsequently got
removed in NixOS 20.09, which effectively means that tests are going to
fail as soon as we build it with NixOS 20.09 or anything newer.
I've put "# fmt: off" at the start of every testScript, because
formatting with Black really messes up indentation and I don't think it
really adds anything in value or readability for inlined Python scripts.
Signed-off-by: aszlig <aszlig@nix.build>
2020-10-17 23:32:03 +02:00
Eelco Dolstra
e6247a584d
Merge branch 'fix-and-ci-static-builds' of https://github.com/obsidiansystems/nix into master
2020-10-17 22:59:27 +02:00
Eelco Dolstra
2a37c35650
Merge pull request #4151 from obsidiansystems/bump-nixpkgs
...
Bump Nixpkgs to hopefully fix linkrot
2020-10-16 15:05:20 +02:00
John Ericson
1d09923d5b
Merge remote-tracking branch 'obsidian/bump-nixpkgs' into fix-and-ci-static-builds
2020-10-16 04:25:24 +00:00
John Ericson
257090d030
Bump Nixpkgs to hopefully fix linkrot
2020-10-15 21:54:22 +00:00
John Ericson
48ce627377
Make a better -lz hack
...
Per the comments, the underlying issue is
https://github.com/libarchive/libarchive/issues/1446 , knowing this
allows the hack to be much more targetted.
2020-10-15 20:13:01 +00:00
John Ericson
64be1c15c2
Add missing include for MAX_PATH
...
And remove one that we didn't actually need to add
2020-10-15 19:05:17 +00:00
John Ericson
fccef6a7fa
Merge remote-tracking branch 'upstream/master' into fix-and-ci-static-builds
2020-10-15 18:55:03 +00:00
John Ericson
f6ed1a96b3
build-static
-> buildStatic
in Nix's flake
2020-10-15 18:54:36 +00:00
John Ericson
0fefc2a439
Merge remote-tracking branch 'upstream/master' into typed-goal-maps
2020-10-14 20:49:01 +00:00
Eelco Dolstra
11882d7c7c
Create /etc/passwd *after* figuring out the sandbox uid/gid
...
Fixes build failures like
# nix log /nix/store/gjaa0psfcmqvw7ivggsncx9w364p3s8s-sshd.conf-validated.drv
No user exists for uid 30012
2020-10-14 12:20:58 +02:00
John Ericson
55592b253f
Add some more docs
2020-10-13 18:04:24 +00:00
John Ericson
13804f126e
Merge remote-tracking branch 'upstream/master' into typed-goal-maps
2020-10-13 18:02:32 +00:00
Eelco Dolstra
2653801939
Merge branch 'split_build_cc' of https://github.com/obsidiansystems/nix
2020-10-13 15:36:55 +02:00
Eelco Dolstra
7e44adda46
Merge pull request #4141 from volth/patch-11
...
Handle amount of disk space saved by hard linking being negative
2020-10-13 11:06:29 +02:00
John Ericson
bdc7720227
Merge branch 'master' of github.com:NixOS/nix into trustless-remote-builder-simple
2020-10-12 23:00:18 +00:00
John Ericson
1b8ebe92dc
Merge remote-tracking branch 'obsidian/split_build_cc' into typed-goal-maps
2020-10-12 20:47:22 +00:00
John Ericson
a73959e6be
Merge remote-tracking branch 'upstream/master' into split_build_cc
2020-10-12 17:20:46 +00:00
John Ericson
d334fd4882
Merge branches 'split_build_hh-0', 'split_build_hh-1', 'split_build_hh-2', 'split_build_hh-3' and 'split_build_hh-4' into split_build_cc
2020-10-12 17:20:12 +00:00
John Ericson
542972f029
Trim worker.hh
2020-10-12 17:16:48 +00:00
John Ericson
0e2306204a
Rename to hand-hold git (worker.hh)
2020-10-12 17:16:48 +00:00
John Ericson
3ffa3546bd
Trim substitution-goal.hh
2020-10-12 17:16:25 +00:00
John Ericson
e77a2344d5
Rename to hand-hold git (substitution-goal.hh)
2020-10-12 17:16:25 +00:00
John Ericson
d585b4c54f
Trim hook-instance.hh
2020-10-12 17:16:13 +00:00
John Ericson
10b749a156
Rename to hand-hold git (hook-instance.hh)
2020-10-12 17:16:13 +00:00
John Ericson
8067d32f2a
Trim goal.hh
2020-10-12 17:16:00 +00:00
John Ericson
0d0e345cdc
Rename to hand-hold git (goal.hh)
2020-10-12 17:16:00 +00:00
John Ericson
2ce726947a
Trim derivation-goal.hh
2020-10-12 17:15:32 +00:00
John Ericson
4eb8c69853
Rename to hand-hold git (derivation-goal.hh)
2020-10-12 17:15:32 +00:00
John Ericson
f7099965bf
Change .cc files to use split build headers
2020-10-12 17:08:52 +00:00
John Ericson
5a97621d6d
Prepare for build/*.hh headers
2020-10-12 17:07:51 +00:00
volth
eee18f88dd
Handle amount of disk space saved by hard linking being negative
...
Fixes bogus messages like "currently hard linking saves 17592186044416.00 MiB".
2020-10-12 16:06:38 +00:00
Eelco Dolstra
20d2140e45
Merge pull request #4136 from obsidiansystems/split-uds-remote-store
...
Split out uds-remote-store.{cc.hh}
2020-10-12 14:11:58 +02:00
John Ericson
15fdb7cc6b
Split out uds-remote-store.{cc.hh}
2020-10-11 17:37:05 +00:00
John Ericson
38e3897162
Copy {uds-,}remote-store.{cc,hh}
...
This prepares for the splitting that happens in the next commit.
2020-10-11 17:18:26 +00:00