From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id DA9897CC6E; Wed, 28 Sep 2022 17:01:46 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 7AF7B7CC30; Wed, 28 Sep 2022 17:01:42 +0000 (UTC) Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by atuin.qyliss.net (Postfix) with ESMTPS id 3575B7CBB6 for ; Wed, 28 Sep 2022 17:01:39 +0000 (UTC) Received: by mail-ej1-x629.google.com with SMTP id 13so28462187ejn.3 for ; Wed, 28 Sep 2022 10:01:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unikie.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=LTlkIkYdTw4eFza4ED35ezciJTMTh8gzNRugZwrFSdY=; b=Ow3BHjgEWzwpnS8/6uM9gXhDYGZR6l6h6h5ajde7hqfU0UfhKd1Dq2ZrGc0lF8BckC /YeKUhLO+gzVlnxGeqahH9bzhPWwhom3PZdkkAy2U1o3DmfETbHkO35z7jtaNuJ7X3Cn bXDsQWbIOBYQrSSciGHFQhz6Bl1c07OyeohWEDwYp8jXLBrdNYddrfN9RQlv8BMM/eXP yfzkM2+8wVqUXiLDi3GtkOrZcP8H3pJeHdyN/4pL18Y6IuPKQYZ72rOHVCRUljEWEEpb w/FEwPkQi9KjZYYAdQdoCIpwEpjSsQdcbqK1HORlUMxf33uLuYQrVIpLixe4rBKl0UIw BqkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=LTlkIkYdTw4eFza4ED35ezciJTMTh8gzNRugZwrFSdY=; b=PDbbcC9agkFapSZq6K0rjetW/dttJSyz88q7JPkNYXVaMWgrRdTtTNP/iPb8JG/zMO RNR7TkrgWFhRh9DK6qEFuo5ZtMEUIfCQGzI/fDhCaOFqCcqqEChf5Xpx3VTKcCqZU583 +Asq57Y3EimTT5FsH1YPQGOZRcrOtOSopOsmHx7z3m4YnZK/gkgm+xlhcuuhHYXZ927t iU/m0jqvUgvb+QyPsgMHHGTFTN570aj9wUQZtz/Ro/RJVqp9KyxmnXajF758NQLmds/0 w51599/OcRhR9lim6eK785CPmnP+djgVO3XtT7I6xE/IhmT+/omFsO4g6Fm2w6IZneh7 MsiA== X-Gm-Message-State: ACrzQf078+ap6e/xLO//CMJzADmEY0CzAhs/orgNnO11uFKcmBnSBSRf 3QUnvSgdjiT9tUnC8ss42/GnicA9ZmMGGJrZ X-Google-Smtp-Source: AMsMyM7qaDeLQllD2uY4DmNTM8uE4f7wtGVHvvbyS1hQIVyt5u93vCs81fJnemNG3AGy/SQskF9KpQ== X-Received: by 2002:a17:907:3e02:b0:782:1267:f2c8 with SMTP id hp2-20020a1709073e0200b007821267f2c8mr27857225ejc.585.1664384498756; Wed, 28 Sep 2022 10:01:38 -0700 (PDT) Received: from x220.qyliss.net (p4feb786f.dip0.t-ipconnect.de. [79.235.120.111]) by smtp.gmail.com with ESMTPSA id r19-20020a05640251d300b0044f21c69608sm3827356edd.10.2022.09.28.10.01.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 10:01:38 -0700 (PDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id B26A92E3; Wed, 28 Sep 2022 17:01:37 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [RFC PATCH nixpkgs 4/9] crosvm.updateScript: don't vendor Cargo.lock Date: Wed, 28 Sep 2022 17:01:23 +0000 Message-Id: <20220928170128.1583791-5-alyssa.ross@unikie.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220928170128.1583791-1-alyssa.ross@unikie.com> References: <20220928170128.1583791-1-alyssa.ross@unikie.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: FI5XQBP4SBILI2326MAFE6UQYYA2WWC7 X-Message-ID-Hash: FI5XQBP4SBILI2326MAFE6UQYYA2WWC7 X-MailFrom: alyssa.ross@unikie.com X-Mailman-Rule-Hits: header-match-devel.spectrum-os.org-0 X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1 CC: Ville Ilvonen X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This is no longer required as crosvm now includes a Cargo.lock in-tree again. Signed-off-by: Alyssa Ross --- 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