crosvm: 79.12607.0.0-rc4 -> 81.12871.0.0-rc1

This commit is contained in:
Alyssa Ross 2020-04-21 23:39:05 +00:00
parent 56e9d1f936
commit 98b3ac8d40
2 changed files with 21 additions and 13 deletions

View file

@ -1,5 +1,5 @@
{ stdenv, rustPlatform, fetchgit, runCommand, symlinkJoin { stdenv, lib, rustPlatform, fetchgit, runCommand, symlinkJoin
, pkgconfig, minijail, dtc, libusb1, libcap , pkgconfig, minijail, dtc, libusb1, libcap, linux
}: }:
let let
@ -53,7 +53,7 @@ in
./default-seccomp-policy-dir.diff ./default-seccomp-policy-dir.diff
]; ];
cargoSha256 = "1s9nfgfqk140hg08i0xzylnrgrx84dqss0vnvhxnydwy9q03nk7r"; cargoSha256 = "0lhivwvdihslwp81i3sa5q88p5hr83bzkvklrcgf6x73arwk8kdz";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -73,13 +73,17 @@ in
cp seccomp/${arch}/* $out/share/policy/ cp seccomp/${arch}/* $out/share/policy/
''; '';
CROSVM_CARGO_TEST_KERNEL_BINARY =
lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform)
"${linux}/${stdenv.hostPlatform.platform.kernelTarget}";
passthru = { passthru = {
inherit adhdSrc; inherit adhdSrc;
src = crosvmSrc; src = crosvmSrc;
updateScript = ./update.py; updateScript = ./update.py;
}; };
meta = with stdenv.lib; { meta = with lib; {
description = "A secure virtual machine monitor for KVM"; description = "A secure virtual machine monitor for KVM";
homepage = "https://chromium.googlesource.com/chromiumos/platform/crosvm/"; homepage = "https://chromium.googlesource.com/chromiumos/platform/crosvm/";
maintainers = with maintainers; [ qyliss ]; maintainers = with maintainers; [ qyliss ];

View file

@ -1,19 +1,23 @@
{ {
"version": "79.12607.0.0-rc4", "version": "81.12871.0.0-rc1",
"components": { "components": {
"chromiumos/platform/crosvm": { "chromiumos/platform/crosvm": {
"url": "https://chromium.googlesource.com/chromiumos/platform/crosvm", "url": "https://chromium.googlesource.com/chromiumos/platform/crosvm",
"rev": "cfb7db44eb9e5a0bca9a22bfb985252ef74ab251", "rev": "8b8c01e1ad31718932491e4aee63f56109a138e2",
"date": "2019-10-17T23:22:08+00:00", "date": "2020-01-25T02:28:10+00:00",
"sha256": "0gm1ggyzh9qfizm36jmh71c3anygxj1840cm94h71kzg9kiw0330", "sha256": "1qmf1k06pwynh15c3nr9m6v90z2pkk930xniwvlvbvnazrk4rllg",
"fetchSubmodules": false "fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}, },
"chromiumos/third_party/adhd": { "chromiumos/third_party/adhd": {
"url": "https://chromium.googlesource.com/chromiumos/third_party/adhd", "url": "https://chromium.googlesource.com/chromiumos/third_party/adhd",
"rev": "a8df1c52bde3bfd2aebc1d7adcd6f195eb212cb1", "rev": "f361d5b02623274723bff251dafa1e2a2887b013",
"date": "2019-10-17T18:53:18+00:00", "date": "2020-01-23T18:37:46+00:00",
"sha256": "1hyvnvwr5ka9zw4h7hhl6fpsfl2acp3zy4wr5qrw8s1cn8ljr9vy", "sha256": "1p8iwjwgmcgmzri03ik2jaid8l0ch0bzn6z9z64dix1hlrvrlliw",
"fetchSubmodules": false "fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
} }
} }
} }