patches and low-level development discussion
 help / color / mirror / code / Atom feed
From: Alyssa Ross <alyssa.ross@unikie.com>
To: devel@spectrum-os.org
Cc: Ville Ilvonen <ville.ilvonen@unikie.com>
Subject: [RFC PATCH nixpkgs 4/9] crosvm.updateScript: don't vendor Cargo.lock
Date: Wed, 28 Sep 2022 17:01:23 +0000	[thread overview]
Message-ID: <20220928170128.1583791-5-alyssa.ross@unikie.com> (raw)
In-Reply-To: <20220928170128.1583791-1-alyssa.ross@unikie.com>

This is no longer required as crosvm now includes a Cargo.lock in-tree
again.

Signed-off-by: Alyssa Ross <alyssa.ross@unikie.com>
---
 pkgs/applications/virtualization/crosvm/update.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py
index 64adec42957..7a94aedefdb 100755
--- a/pkgs/applications/virtualization/crosvm/update.py
+++ b/pkgs/applications/virtualization/crosvm/update.py
@@ -50,16 +50,3 @@ with urlopen(f'https://chromium.googlesource.com/chromiumos/platform/crosvm/+log
 
 # Update the version, git revision, and hash in crosvm's default.nix.
 subprocess.run(['update-source-version', 'crosvm', f'--rev={rev}', version])
-
-# Find the path to crosvm's default.nix, so Cargo.lock can be written
-# into the same directory.
-argv = ['nix-instantiate', '--eval', '--json', '-A', 'crosvm.meta.position']
-position = json.loads(subprocess.check_output(argv).decode('utf-8'))
-filename = re.match(r'[^:]*', position)[0]
-
-# Generate a Cargo.lock
-run = ['.',
-       dirname(abspath(__file__)) + '/generate-cargo.sh',
-       dirname(filename) + '/Cargo.lock']
-expr = '(import ./. {}).crosvm.overrideAttrs (_: { dontCargoSetupPostUnpack = true; })'
-subprocess.run(['nix-shell', '-E', expr, '--run', shlex.join(run)])
-- 
2.37.1



  parent reply	other threads:[~2022-09-28 17:01 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-28 17:01 [RFC PATCH nixpkgs 0/9] virtio-gpu with crosvm and cloud-hypervisor Alyssa Ross
2022-09-28 17:01 ` [RFC PATCH nixpkgs 1/9] crosvm: switch back to old git repo URL Alyssa Ross
2022-09-28 17:01 ` [RFC PATCH nixpkgs 2/9] crosvm.updateScript: update release branch format Alyssa Ross
2022-09-28 17:01 ` [RFC PATCH nixpkgs 3/9] crosvm: 104.0 -> 106.2 Alyssa Ross
2022-09-28 17:01 ` Alyssa Ross [this message]
2022-09-28 17:01 ` [RFC PATCH nixpkgs 5/9] crosvm: add fixes for cloud-hypervisor virtio-gpu Alyssa Ross
2022-09-28 17:01 ` [RFC PATCH nixpkgs 6/9] rustPlatform: forward unpack hooks to cargo fetch Alyssa Ross
2022-09-28 17:01 ` [RFC PATCH nixpkgs 7/9] cloud-hypervisor: add virtio-gpu support Alyssa Ross
2022-09-29  8:53   ` Alyssa Ross
2022-09-28 17:01 ` [RFC PATCH nixpkgs 8/9] ocamlPackages.wayland: 1.0 -> unstable-2022-05-07 Alyssa Ross
2022-09-28 17:09   ` sternenseemann
2022-09-28 17:17     ` Alyssa Ross
2022-09-29 12:35       ` sternenseemann
2022-09-28 17:01 ` [RFC PATCH nixpkgs 9/9] wayland-proxy-virtwl: unstable-2021-12-05 -> unstable-2022-08-06 Alyssa Ross

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=20220928170128.1583791-5-alyssa.ross@unikie.com \
    --to=alyssa.ross@unikie.com \
    --cc=devel@spectrum-os.org \
    --cc=ville.ilvonen@unikie.com \
    /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).