Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1523028
This commit is contained in:
Vladimír Čunát
2019-06-03 10:00:49 +02:00
392 changed files with 11536 additions and 4972 deletions

View File

@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0lmbsnjia44h4rskqkv9yc7xb6f3qjgbg8kcr9zqnr7ivr5fjcxg";
};
cargoSha256 = "0gainr5gfy0bbhr6078zvgx0kzp53slxjp37d3da091ikgzgfn51";
cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx";
meta = with stdenv.lib; {
description = "A container debugging tool based on FUSE";

View File

@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9";
};
cargoSha256 = "16f3ys0zzha8l5jdklmrqivl8hmrb9qgqgzcm3jn06v45hls9lan";
cargoSha256 = "1k4y37x783fsd8li17k56vlx5ziwmrz167a0w5mcb9sgyd2kc19a";
buildInputs = [ libseccomp ];