From: Simon Tournier <zimon.toutoune@gmail.com>
To: 63462@debbugs.gnu.org
Cc: Simon Tournier <zimon.toutoune@gmail.com>
Subject: [bug#63462] [PATCH maintenance] hydra: build-package-metadata: Update fields in sources.json.
Date: Fri, 12 May 2023 11:45:04 +0200 [thread overview]
Message-ID: <20230512094504.2675076-1-zimon.toutoune@gmail.com> (raw)
This format had been discussed in
<https://gitlab.softwareheritage.org/swh/infra/sysadm-environment/-/issues/4868>.
* hydra/build-package-metadata.scm (origin->json)[resolve]: Add the fields
'outputHashAlgo' and 'outputHashMode'.
---
hydra/build-package-metadata.scm | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/hydra/build-package-metadata.scm b/hydra/build-package-metadata.scm
index 1ddb409..d110d4d 100755
--- a/hydra/build-package-metadata.scm
+++ b/hydra/build-package-metadata.scm
@@ -1,7 +1,7 @@
#!/usr/bin/env -S guix repl --
!#
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2020, 2021 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2020, 2021, 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2023 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
@@ -160,13 +160,23 @@ superseded packages."
(else '()))
,@(if (or (eq? url-fetch method)
(eq? url-fetch/tarbomb method)
- (eq? url-fetch/zipbomb method))
+ (eq? url-fetch/zipbomb method)
+ (eq? git-fetch method)
+ (eq? svn-fetch method)
+ (eq? svn-multi-fetch method)
+ (eq? hg-fetch method))
(let* ((content-hash (origin-hash origin))
(hash-value (content-hash-value content-hash))
(hash-algorithm (content-hash-algorithm content-hash))
(algorithm-string (symbol->string hash-algorithm)))
`(("integrity" . ,(string-append algorithm-string "-"
- (base64-encode hash-value)))))
+ (base64-encode hash-value)))
+ ("outputHashAlgo" . ,algorithm-string)
+ ("outputHashMode" . ,(if (or (eq? url-fetch method)
+ (eq? url-fetch/tarbomb method)
+ (eq? url-fetch/zipbomb method))
+ "flat"
+ "recursive"))))
'())
,@(if (eq? method git-fetch)
`(("git_ref" . ,(git-reference-commit uri)))
base-commit: 5a6b8cd7286d1c8906beaa35ebba6eff5bae3a79
--
2.38.1
next reply other threads:[~2023-05-12 9:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-12 9:45 Simon Tournier [this message]
2023-05-12 11:47 ` [bug#63462] [PATCH maintenance] hydra: build-package-metadata: Update fields in sources.json Ludovic Courtès
2023-05-12 12:12 ` Simon Tournier
2023-05-24 14:32 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230512094504.2675076-1-zimon.toutoune@gmail.com \
--to=zimon.toutoune@gmail.com \
--cc=63462@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).