From 4c80e3665c019daaa91347fbcb4e5ae078cc39d3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 30 Sep 2022 21:09:01 +0000 Subject: [PATCH] crosvm.updateScript: don't vendor Cargo.lock This is no longer required as crosvm now includes a Cargo.lock in-tree again. --- .../virtualization/crosvm/generate-cargo.sh | 7 ------- pkgs/applications/virtualization/crosvm/update.py | 13 ------------- 2 files changed, 20 deletions(-) delete mode 100644 pkgs/applications/virtualization/crosvm/generate-cargo.sh diff --git a/pkgs/applications/virtualization/crosvm/generate-cargo.sh b/pkgs/applications/virtualization/crosvm/generate-cargo.sh deleted file mode 100644 index 216cafe367ca..000000000000 --- 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 64adec429575..7a94aedefdb6 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)])