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
4636cc9a1f
Merge remote-tracking branch 'obsidian/path-info' into ca-drv-exotic
2020-10-15 02:23:39 +00:00
John Ericson
10e81bf871
Fix conditions for ca-references
2020-10-15 02:21:28 +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
John Ericson
47f0d7b798
Cleanup tabs
2020-10-13 16:22:30 +00:00
John Ericson
9c5de066eb
Merge remote-tracking branch 'obsidian/path-info' into ca-drv-exotic
2020-10-13 16:21:33 +00:00
John Ericson
34b3bfac25
Merge remote-tracking branch 'upstream/master' into path-info
2020-10-13 15:36:20 +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
b6b383d569
Work around clang destructing + capturing bug yet again
2020-10-13 04:36:20 +00:00
John Ericson
00c607b563
Work around clang destructing + capturing bug again
2020-10-13 04:11:25 +00:00
John Ericson
d8d7f50f62
Merge remote-tracking branch 'obsidian/path-info' into ca-drv-exotic
2020-10-13 03:46:41 +00:00
John Ericson
39c11c5c01
Organize content-address.hh a bit better
2020-10-13 03:43:13 +00:00
John Ericson
a4e5de1b9d
Derivations can output "text-hashed" data
...
In particular, this means that derivations can output derivations. But
that ramification isn't (yet!) useful as we would want, since there is
no way to have a dependent derivation that is itself a dependent
derivation.
2020-10-13 02:15:48 +00:00
John Ericson
a0f369aa3f
Merge remote-tracking branch 'upstream/master' into path-info
2020-10-12 20:48:35 +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
John Ericson
5c74a6147b
Properly type the derivation and substitution goal maps
...
As a bonus, Worker::removeGoal is less inefficient.
2020-10-11 17:07:14 +00:00
Eelco Dolstra
b0fbf3a653
Merge pull request #4135 from obsidiansystems/split-local-fs-store-header
...
Split out `local-fs-store.hh`
2020-10-11 18:49:40 +02:00
John Ericson
8cc510fb79
Merge branches 'build-1', 'build-2', 'build-3', 'build-4', 'build-5', 'build-6', 'build-7' and 'build-8' into split_build_cc
2020-10-11 16:44:34 +00:00
John Ericson
bcb67e1ed8
Trim lock.cc
2020-10-11 16:44:19 +00:00
John Ericson
e0be04129b
Rename to hand-hold git (lock.cc)
2020-10-11 16:44:14 +00:00