[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#36841: [PATCH] build/cargo-build-system: Patch cargo checksums.
From: |
Efraim Flashner |
Subject: |
bug#36841: [PATCH] build/cargo-build-system: Patch cargo checksums. |
Date: |
Tue, 30 Jul 2019 08:59:03 +0300 |
User-agent: |
Mutt/1.12.1 (2019-06-15) |
On Mon, Jul 29, 2019 at 06:44:31PM -0700, Ivan Petkov wrote:
> Hi Efraim,
>
> > On Jul 29, 2019, at 12:04 PM, Efraim Flashner <address@hidden> wrote:
> >
> > +;; After patching the 'patch-generated-file-shebangs phase any vendored
> > crates
> > +;; will have a mismatch on their checksum.
> > +(define* (patch-cargo-checksums #:key
> > + (vendor-dir "guix-vendor")
> > + #:allow-other-keys)
>
> [snip]
>
> > + (replace 'install install)
> > + (add-after 'patch-generated-file-shebangs 'patch-cargo-checksums
> > patch-cargo-checksums)))
>
> I can’t quite remember the order the phases run in off the top of my head.
> Would it be possible to
> make the configure/checksum generation phase run after shebang-patching (or
> ensure the patching
> happens first)? It would avoid having to checksum all the files twice that
> way…
>
> —Ivan
I thought about it a bit more after I sent the patch, and I'm pretty
sure this is only needed when there's a Cargo.lock file in the build
directory. So in actuality it should be more like:
(when (file-exists? "Cargo.lock")
(begin
(delete-file "Cargo.lock")
(invoke "cargo" "generate-lockfile")
(patch-cargo-checksums ...)))
I'm going to close this bug/patch and re-submit it when I've given it a
bit more work so it doesn't do the expensive compute-checksums
computation on all builds.
--
Efraim Flashner <address@hidden> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
signature.asc
Description: PGP signature