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 BD484721C6; Fri, 30 Sep 2022 21:09:55 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 8D94B7216C; Fri, 30 Sep 2022 21:09:54 +0000 (UTC) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by atuin.qyliss.net (Postfix) with ESMTPS id 5CBCD7213C for ; Fri, 30 Sep 2022 21:09:52 +0000 (UTC) Received: by mail-ej1-x62d.google.com with SMTP id 13so11528254ejn.3 for ; Fri, 30 Sep 2022 14:09:52 -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=V7oejqX6xItLVFG5hYrJCwXyrb0/XXd1TxSJMQ+TWV1PFA5aMj3k7o/GP3xpH9JGsc 9npgutQWnn7tmkPmDfk8p5OPdnmtnCgCIbwIAI0WRGJ5mB2JOa94rRJ2BK/JG0Me0gwv KFLGor1waN/kQ1JmwWXKGjEelrkUfoJ+Js5eK7QNj8LFcs1hgzbZvI0fpP1XzVUG4Avp QVG+UcyTc6Bb85Xed8JKLWzXIRA1G1qXEcuSpg9RYv+CA8DPgvVQ4ipCfydV3kJb0Zwk +Or6kzsYIH24xekrsqA8qdlduQ4ZaWf0y+cngE5LLSxUxTsn4Dfm2/uhTecgiJb+cPP3 0GTQ== 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=w4b3Vu6LU5O4rAB5L30mGrdxknQXnWd+9+BfASaKFIXGjw6/yvZivUwXWunY0nZ8SC y1nIdQ1fmMU5mlyWgYbBjbCmykK05kfxuxeTMKQT1r3GpOjEwic2pOBXzyK3UQ7pqCeT vMw75aAsN4t2NVwUzxA87vTJjgsAHHjT8fHZQI0YyWJOhMyeXsCX74SpOTxa0L1D4ccV idRebwvwTjNC9m8WhKfImOaVGxl3T5EkAtQRL1k9V05uXWwFaobwZ8kwY1mp3ZZQySMU eOGBVRxiXA1mlt9BYjGodiVn0hsgrqY2Yf6V1q9UqWrZYvKVpN0aeL8RJvUL1+BpNHX6 C3/g== X-Gm-Message-State: ACrzQf0as4FiUTqsIikRpqmSNGe/OjL1ffHolJy7vXZbfY8a6wYa4bTL 4rWz26n3EFm3Tw/RDdRNr9Z1a362xiPC6LY0 X-Google-Smtp-Source: AMsMyM7rec2sHhDeuMA1Hy0pCrWxKySmdqPuOqfQpbLOVlB0WGzhQpeUfr8Gnun0cXJdTbWWPhnNow== X-Received: by 2002:a17:906:8441:b0:779:33be:68c9 with SMTP id e1-20020a170906844100b0077933be68c9mr7897649ejy.720.1664572192000; Fri, 30 Sep 2022 14:09:52 -0700 (PDT) Received: from x220.qyliss.net (p54b8e692.dip0.t-ipconnect.de. [84.184.230.146]) by smtp.gmail.com with ESMTPSA id e1-20020a50fb81000000b00457c5637578sm2248878edq.63.2022.09.30.14.09.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 14:09:51 -0700 (PDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 3071660B; Fri, 30 Sep 2022 21:09:51 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [RFC PATCH nixpkgs v2 4/9] crosvm.updateScript: don't vendor Cargo.lock Date: Fri, 30 Sep 2022 21:09:01 +0000 Message-Id: <20220930210906.1696349-5-alyssa.ross@unikie.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220930210906.1696349-1-alyssa.ross@unikie.com> References: <20220930210906.1696349-1-alyssa.ross@unikie.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: SGZA44GJNBD5SQDQECLJWK5HIAFUIIRX X-Message-ID-Hash: SGZA44GJNBD5SQDQECLJWK5HIAFUIIRX 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: Puck Meerburg , 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