From unknown Wed Aug 20 00:02:45 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#37144 <37144@debbugs.gnu.org> To: bug#37144 <37144@debbugs.gnu.org> Subject: Status: [PATCH] build/cargo-build-system: Remove 'update-cargo-lock phase. Reply-To: bug#37144 <37144@debbugs.gnu.org> Date: Wed, 20 Aug 2025 07:02:45 +0000 retitle 37144 [PATCH] build/cargo-build-system: Remove 'update-cargo-lock p= hase. reassign 37144 guix-patches submitter 37144 Efraim Flashner severity 37144 normal tag 37144 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 22 09:49:28 2019 Received: (at submit) by debbugs.gnu.org; 22 Aug 2019 13:49:28 +0000 Received: from localhost ([127.0.0.1]:37171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0nSx-0007HE-UT for submit@debbugs.gnu.org; Thu, 22 Aug 2019 09:49:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:34659) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0nSv-0007H2-9L for submit@debbugs.gnu.org; Thu, 22 Aug 2019 09:49:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45301) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0nSt-0007E4-1j for guix-patches@gnu.org; Thu, 22 Aug 2019 09:49:24 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0nSr-0006jY-GR for guix-patches@gnu.org; Thu, 22 Aug 2019 09:49:22 -0400 Received: from flashner.co.il ([178.62.234.194]:37612) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1i0nSr-0006hu-Ae for guix-patches@gnu.org; Thu, 22 Aug 2019 09:49:21 -0400 Received: from localhost (unknown [188.120.128.191]) by flashner.co.il (Postfix) with ESMTPSA id 8D3894024B; Thu, 22 Aug 2019 13:49:18 +0000 (UTC) From: Efraim Flashner To: guix-patches@gnu.org Subject: [PATCH] build/cargo-build-system: Remove 'update-cargo-lock phase. Date: Thu, 22 Aug 2019 16:49:02 +0300 Message-Id: <20190822134902.24168-1-efraim@flashner.co.il> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 178.62.234.194 X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Efraim Flashner , Ivan Petkov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * guix/build/cargo-build-system.scm (update-cargo-lock): Remove procedure. (configure): Delete Cargo.lock file if it exists. (%standard-phases): Remove 'update-cargo-lock. * doc/guix.texi (Build System)[cargo-build-system]: Remove references to the 'update-cargo-lock phase. --- doc/guix.texi | 9 ++++----- guix/build/cargo-build-system.scm | 19 ++++--------------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 043851e418..300d0222a6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5854,11 +5854,10 @@ should be added to the package definition via the =20 In its @code{configure} phase, this build system will make any source in= puts specified in the @code{#:cargo-inputs} and @code{#:cargo-development-inp= uts} -parameters available to cargo. The @code{update-cargo-lock} phase will, -when there is a @code{Cargo.lock} file, update the @code{Cargo.lock} fil= e -with the inputs and their versions available at build time. The -@code{install} phase installs any crate the binaries if they are defined= by -the crate. +parameters available to cargo. It will also remove an included +@code{Cargo.lock} file to be recreated by @code{cargo} during the +@code{build} phase. The @code{install} phase installs any crate the bin= aries +if they are defined by the crate. @end defvr =20 @cindex Clojure (programming language) diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-s= ystem.scm index 7d363a18a5..06ed14b89f 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -134,22 +134,12 @@ directory =3D '" port) ;; upgrading the compiler for example. (setenv "RUSTFLAGS" "--cap-lints allow") (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) - #t) =20 -;; The Cargo.lock file tells the build system which crates are required = for -;; building and hardcodes their version and checksum. In order to build= with -;; the inputs we provide, we need to recreate the file with our inputs. -(define* (update-cargo-lock #:key - (vendor-dir "guix-vendor") - #:allow-other-keys) - "Regenerate the Cargo.lock file with the current build inputs." + ;; We don't use the Cargo.lock file to determine the package versions = we use + ;; during building, and in any case if one is not present it is create= d + ;; during the 'build phase by cargo. (when (file-exists? "Cargo.lock") - (begin - ;; Unfortunately we can't generate a Cargo.lock file until the che= cksums - ;; are generated, so we have an extra round of generate-all-checks= ums here. - (generate-all-checksums vendor-dir) - (delete-file "Cargo.lock") - (invoke "cargo" "generate-lockfile"))) + (delete-file "Cargo.lock")) #t) =20 ;; After the 'patch-generated-file-shebangs phase any vendored crates wh= o have @@ -203,7 +193,6 @@ directory =3D '" port) (replace 'build build) (replace 'check check) (replace 'install install) - (add-after 'configure 'update-cargo-lock update-cargo-lock) (add-after 'patch-generated-file-shebangs 'patch-cargo-checksums pat= ch-cargo-checksums))) =20 (define* (cargo-build #:key inputs (phases %standard-phases) --=20 2.23.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 28 02:45:41 2019 Received: (at 37144-done) by debbugs.gnu.org; 28 Aug 2019 06:45:41 +0000 Received: from localhost ([127.0.0.1]:49789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i2ri9-0007XK-Eh for submit@debbugs.gnu.org; Wed, 28 Aug 2019 02:45:41 -0400 Received: from flashner.co.il ([178.62.234.194]:55528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i2ri6-0007X7-RU for 37144-done@debbugs.gnu.org; Wed, 28 Aug 2019 02:45:39 -0400 Received: from localhost (unknown [188.120.128.191]) by flashner.co.il (Postfix) with ESMTPSA id EA5C640221 for <37144-done@debbugs.gnu.org>; Wed, 28 Aug 2019 06:45:32 +0000 (UTC) Date: Wed, 28 Aug 2019 09:45:31 +0300 From: Efraim Flashner To: 37144-done@debbugs.gnu.org Subject: patch pushed Message-ID: <20190828064531.GD9350@E5400> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="bAmEntskrkuBymla" Content-Disposition: inline X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 User-Agent: Mutt/1.12.1 (2019-06-15) X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 37144-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --bAmEntskrkuBymla Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable pushed to master as 3762e31b6c8089928aad3186f70f157502950e3b --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --bAmEntskrkuBymla Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl1mIwsACgkQQarn3Mo9 g1EpMRAAiBa8KY0B4t0WBi/BIfxnxli7zRTc7s6+2JNGSDHUzUtjctoJnTd+8hxH LneMi2vMiiLwufyDGFRNSeVvf2t5Kx0sYkjHpsoZDa3SMcMqXD7cSsRTPPxXP9Sb 91MSKPteaZMLIqF+u3+mUxDrkpMIG7U/eG8/yaaoWOMySTYmNCtMHY3V8BiwGDAA JYlH3CwncTZxaYKGDJBI/k94nHF7DniKCtDHBFUZok0Rt1DlWUzX9lDPc1YL5XXg oTVVNItAzx81HBDZhLfYYLDSti/Vrv7lKqyVWRUSuj3FeD5X7OjqCXXApW0+4Azm K4N3uHRsUJiYeO+fEBRqaDDg8jQpgmqoO9jmGXOxRdy5wIhFPIBLyjNSuNCWN3Jg 4Zh+lqCvPmddAzwr3vbhHo33zk9TPnWEoal36TJbdqfJrR8stOBgAjgBJmTHc9SR 4RG/ar5KeVMHeiuvW+jl7Jt5mJyzUdqQidYUbvR46W+YJPKWtNCnuOoprkf+gPcY bIW2Yd+PQgBhUljU1TXXhYHxRlkHlPsacrM67TVCpzm2hGX0Kp/EnFbTlg0rDu7V d/5FAzbz6XYCuZWRxXiGFBtSFD+wwd/h4jNgi3SuVW6xM2l2Tkc3VaR36X3b8oao dCGveW6WhwbzWpz1D7e2GqIt1Fs8aw7K3+qIkt4Cjv3espilmdc= =chFp -----END PGP SIGNATURE----- --bAmEntskrkuBymla-- From unknown Wed Aug 20 00:02:45 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 25 Sep 2019 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator