patches and low-level development discussion
 help / color / mirror / code / Atom feed
From: Puck Meerburg <puck@puckipedia.com>
To: devel@spectrum-os.org
Cc: Puck Meerburg <puck@puckipedia.com>
Subject: [RFC PATCH nixpkgs 4/4] crosvm: apply security-context patches
Date: Fri, 30 Sep 2022 19:46:00 +0000	[thread overview]
Message-ID: <20220930194600.1033126-5-puck@puckipedia.com> (raw)
In-Reply-To: <20220930194600.1033126-1-puck@puckipedia.com>

These patches are available as a separate repo, as buildRustPackage
does not like patching entirely new modules into the source tree.

Signed-off-by: Puck Meerburg <puck@puckipedia.com>
---
 pkgs/applications/virtualization/crosvm/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix
index 40e30dcd819..3660413a281 100644
--- a/pkgs/applications/virtualization/crosvm/default.nix
+++ b/pkgs/applications/virtualization/crosvm/default.nix
@@ -5,12 +5,12 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "crosvm";
-  version = "106.2";
+  version = "106.2-security-context";
 
   src = fetchgit {
-    url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
-    rev = "d58d398581724e81ce57a8dfaeef62c175c06552";
-    sha256 = "huZELmB1oH5RyasmpEXIcJ/mB4fi6fMofj1N01COeI8=";
+    url = "https://puck.moe/git/crosvm";
+    rev = "eb1a080dd8432ea7ad400816388d67a5d64081e4";
+    sha256 = "sha256-iExgWO1/PBCWvzV+5Z6UrKxOsHaFED9GcGQGc4rVJw0=";
     fetchSubmodules = true;
   };
 
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     ./devices-vhost_user-loosen-expected-message-order.patch
   ];
 
-  cargoSha256 = "18mj0zc6yfwyrw6v1vl089dhh04kv2pzb99bygnn8nymdlx4fjqa";
+  cargoSha256 = "1fasy7l8ia53739wzz4cgbphn7h4gv1rfz0syqbl4kfl6hy0p1vb";
 
   nativeBuildInputs = [ minijail-tools pkg-config protobuf wayland-scanner ];
 
-- 
2.35.1



  parent reply	other threads:[~2022-09-30 19:48 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-30 19:45 [RFC PATCH nixpkgs 0/4] Wayland security-context support Puck Meerburg
2022-09-30 19:45 ` [RFC PATCH nixpkgs 1/4] cloud-hypervisor: workaround keymap mmap Puck Meerburg
2022-09-30 19:45 ` [RFC PATCH nixpkgs 2/4] wlroots: apply security-context patches Puck Meerburg
2022-09-30 19:45 ` [RFC PATCH nixpkgs 3/4] sway: " Puck Meerburg
2022-09-30 19:46 ` Puck Meerburg [this message]
2022-09-30 22:08 ` [RFC PATCH nixpkgs 0/4] Wayland security-context support Puck Meerburg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220930194600.1033126-5-puck@puckipedia.com \
    --to=puck@puckipedia.com \
    --cc=devel@spectrum-os.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://spectrum-os.org/git/crosvm
	https://spectrum-os.org/git/doc
	https://spectrum-os.org/git/mktuntap
	https://spectrum-os.org/git/nixpkgs
	https://spectrum-os.org/git/spectrum
	https://spectrum-os.org/git/ucspi-vsock
	https://spectrum-os.org/git/www

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).