summaryrefslogtreecommitdiff
path: root/nix-test
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2017-08-11 20:27:58 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2017-08-11 20:27:58 +0000
commit5a54f9ff51a2c3c1ce7c957f246a88818cbdb61b (patch)
treeb2cafa0d6fa575e3162a9f46f9ee747f01e2dbc1 /nix-test
parent7324888e8097f4c5f7ae96ac243b055551472d7f (diff)
parent50fdc684dc9bd5302a7d6c0fe0b21b3418b3923d (diff)
parent0e0de31c78d00a3d98cd1ba38a9d04088d2f11af (diff)
downloadnix-5a54f9ff51a2c3c1ce7c957f246a88818cbdb61b.zip
Merge #728 #731
728: Use upstream libc ptrace FFI r=Susurrus This might fail on Mac because of how libc defines ptrace on that platform, but we'll see! 731: Use upstream libc definitions in mman module r=asomers