[PATCH nixpkgs v2 0/8] chromiumOSPackages: 83.13020.0.0-rc1 -> 89.13729.0.0-rc1

Alyssa Ross
2021-05-29T14:42:18Z

Hi everyone,

This is a continuation of the effort to update our chromiumOSPackages,
which was started by Jamie a couple of months ago[1].

I've taken it over, and I think it should be good now. Specifically,
since Jamie's original submission I:

* Re-enabled xdg-shell in Sommelier, using the reverted upstream
implementation[2] instead of Puck's.

* Fixed the crosvm build by fixing its Cargo.lock, and stopping the
boot test trying to open /dev/log, which doesn't exist in Nix
builds.

* Rebased a crosvm patch that was added to Spectrum in the meantime.

* Removed a kernel patch that was added to Spectrum in the meantime
but this update makes obsolete.

I've tested that everything in spectrumPackages and chromiumOSPackages
builds, and that spectrumPackages.spectrum-vm still runs.

Jamie, thank you so much for getting us most of the way there with
this -- you saved me a lot of time and I really appreciate it.

[1]: https://spectrum-os.org/lists/archives/spectrum-devel/0100017891d36f4f-0c348828-2ed6-4694-b75c-44d0d659c13c-000000@email.amazonses.com/
[2]: https://spectrum-os.org/lists/archives/spectrum-devel/87wntkwq7z.fsf@alyssa.is

Alyssa Ross (3):
chromiumOSPackages.sommelier: update patches
crosvm: fix build
spectrumPackages.linux: drop evged patch

Jamie McClymont (5):
chromiumOSPackages: 83.13020.0.0-rc1 -> 89.13729.0.0-rc1
chromiumOSPackages.linux: fix config
chromiumOSPackages.common-mk: update patches
chromiumOSPackages.vm_protos: drop GN patch
chromiumOSPackages.common-mk: disable clang-only warnings

...-mk-don-t-leak-source-absolute-paths.patch | 115 +-
...ommon-mk-.gn-don-t-hardcode-env-path.patch | 8 +-
.../linux/chromium-os/common-mk/default.nix | 6 +-
.../crosvm/Regenerate-Cargo.lock.patch | 681 ++++++++++++
...om-tap-fd.patch => VIRTIO_NET_F_MAC.patch} | 202 ++--
.../linux/chromium-os/crosvm/default.nix | 20 +-
...er-don-t-leak-source-absolute-paths.patch} | 10 +-
...tools-sommelier-Switch-to-the-stabl.patch} | 981 ++++++++++--------
...mmelier-make-building-demos-optional.patch | 100 --
.../linux/chromium-os/sommelier/default.nix | 5 +-
.../linux/chromium-os/upstream-info.json | 44 +-
...03-vm_tools-proto-fix-parallel-build.patch | 39 -
.../linux/chromium-os/vm_protos/default.nix | 2 -
pkgs/os-specific/linux/kernel/linux-cros.nix | 6 +-
pkgs/os-specific/linux/kernel/patches.nix | 9 -
pkgs/os-specific/linux/spectrum/linux/vm.nix | 3 -
16 files changed, 1445 insertions(+), 786 deletions(-)
create mode 100644 pkgs/os-specific/linux/chromium-os/crosvm/Regenerate-Cargo.lock.patch
rename pkgs/os-specific/linux/chromium-os/crosvm/{0001-crosvm-support-setting-guest-MAC-from-tap-fd.patch => VIRTIO_NET_F_MAC.patch} (56%)
rename pkgs/os-specific/linux/chromium-os/sommelier/{0004-sommelier-don-t-leak-source-absolute-paths.patch => 0003-sommelier-don-t-leak-source-absolute-paths.patch} (69%)
rename pkgs/os-specific/linux/chromium-os/sommelier/{0005-sommelier-use-stable-xdg-shell-protocol.patch => 0004-Revert-Revert-vm_tools-sommelier-Switch-to-the-stabl.patch} (66%)
delete mode 100644 pkgs/os-specific/linux/chromium-os/sommelier/0006-sommelier-make-building-demos-optional.patch
delete mode 100644 pkgs/os-specific/linux/chromium-os/vm_protos/0003-vm_tools-proto-fix-parallel-build.patch

--
2.31.1