From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2DQsEoR8916SQgAA0tVLHw (envelope-from ) for ; Sat, 27 Jun 2020 17:06:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id mLgUDoR8917ICgAAbx9fmQ (envelope-from ) for ; Sat, 27 Jun 2020 17:06:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7F0DB9404D4 for ; Sat, 27 Jun 2020 17:06:11 +0000 (UTC) Received: from localhost ([::1]:55040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpEHI-0006kc-IE for larch@yhetil.org; Sat, 27 Jun 2020 13:06:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpEHC-0006kF-N5 for guix-patches@gnu.org; Sat, 27 Jun 2020 13:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32960) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jpEHC-0006VC-Dx for guix-patches@gnu.org; Sat, 27 Jun 2020 13:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jpEHC-00082m-8V for guix-patches@gnu.org; Sat, 27 Jun 2020 13:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42019] [PATCH 1/1] website: Add integrity to JSON sources. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jun 2020 17:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42019 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: zimoun Cc: 42019@debbugs.gnu.org Received: via spool by 42019-submit@debbugs.gnu.org id=B42019.159327756130914 (code B ref 42019); Sat, 27 Jun 2020 17:06:02 +0000 Received: (at 42019) by debbugs.gnu.org; 27 Jun 2020 17:06:01 +0000 Received: from localhost ([127.0.0.1]:44506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpEHB-00082X-42 for submit@debbugs.gnu.org; Sat, 27 Jun 2020 13:06:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpEH8-00082C-NF for 42019@debbugs.gnu.org; Sat, 27 Jun 2020 13:06:00 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59183) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpEH3-0006Ux-H1; Sat, 27 Jun 2020 13:05:53 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=37600 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jpEH2-0000W5-OC; Sat, 27 Jun 2020 13:05:53 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200623151323.29639-1-zimon.toutoune@gmail.com> <20200623152139.512-1-zimon.toutoune@gmail.com> Date: Sat, 27 Jun 2020 19:05:50 +0200 In-Reply-To: <20200623152139.512-1-zimon.toutoune@gmail.com> (zimoun's message of "Tue, 23 Jun 2020 17:21:39 +0200") Message-ID: <87zh8ol9qp.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: 3gIFynFxjtrO Hi! zimoun skribis: > * website/apps/packages/builder.scm (origin->json): Add integrity field u= sing > SRI format. [...] > - `(("url" . ,(list->vector > + `(("urls" . ,(list->vector > (resolve > (match uri > ((? string? url) (list url)) Is this change OK for Repology? Or should we keep =E2=80=9Curl=E2=80=9D in= addition to =E2=80=9Curls=E2=80=9D? > (make-page "sources.json" > `(("sources" . ,(list->vector (map package->json (all-packa= ges)))) > - ("version" . "1")) > + ("version" . "1") > + ("revision" . ,%guix-version)) There=E2=80=99s no guarantee that =E2=80=98%guix-version=E2=80=99 is a comm= it ID, so perhaps we should do something like: (match (current-profile) (#f %guix-version) ;for lack of a better ID (profile (let ((channel (find guix-channel? (profile-channels profile)))) (channel-commit channel)))) Otherwise LGTM, thank you! Ludo=E2=80=99.