diff options
author | Alyssa Ross <alyssa.ross@unikie.com> | 2022-09-30 21:09:01 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-11-18 17:46:29 +0000 |
commit | 4c80e3665c019daaa91347fbcb4e5ae078cc39d3 (patch) | |
tree | 28a56abb3b3a83fe91cca17665102bd68e318be1 /pkgs | |
parent | fb60a5c9473b0796738aa1b1443b8ee5e5ecd1cb (diff) |
crosvm.updateScript: don't vendor Cargo.lock
This is no longer required as crosvm now includes a Cargo.lock in-tree again.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/virtualization/crosvm/generate-cargo.sh | 7 | ||||
-rwxr-xr-x | pkgs/applications/virtualization/crosvm/update.py | 13 |
2 files changed, 0 insertions, 20 deletions
diff --git a/pkgs/applications/virtualization/crosvm/generate-cargo.sh b/pkgs/applications/virtualization/crosvm/generate-cargo.sh deleted file mode 100644 index 216cafe367ca1..0000000000000 --- a/pkgs/applications/virtualization/crosvm/generate-cargo.sh +++ /dev/null @@ -1,7 +0,0 @@ -dir="$(mktemp -d)" && - cd "$dir" && - unpackPhase && - cd "${sourceRoot:-}" && - cargo generate-lockfile && - mv Cargo.lock "$1" -rm -rf "$dir" diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py index 64adec429575a..7a94aedefdb67 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)]) |