From patchwork Thu Sep 16 11:45:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 324 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C7B9427BBE4; Thu, 16 Sep 2021 12:46:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A7E8C27BBE3 for ; Thu, 16 Sep 2021 12:46:42 +0100 (BST) Received: from localhost ([::1]:50806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQpqj-0001lY-Lm for patchwork@mira.cbaines.net; Thu, 16 Sep 2021 07:46:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQpq6-0001lM-EF for guix-patches@gnu.org; Thu, 16 Sep 2021 07:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42438) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQpq6-0003uI-6i for guix-patches@gnu.org; Thu, 16 Sep 2021 07:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mQpq5-0007Jz-O3; Thu, 16 Sep 2021 07:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50620] [PATCH 0/2] Unify 'computed-origin-method' (linux, icecat) Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: mhw@netris.org, guix-patches@gnu.org Resent-Date: Thu, 16 Sep 2021 11:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50620 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50620@debbugs.gnu.org Cc: zimoun , mhw@netris.org X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: mhw@netris.org Received: via spool by submit@debbugs.gnu.org id=B.163179271828070 (code B ref -1); Thu, 16 Sep 2021 11:46:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Sep 2021 11:45:18 +0000 Received: from localhost ([127.0.0.1]:53982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQppO-0007Ig-Cz for submit@debbugs.gnu.org; Thu, 16 Sep 2021 07:45:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:54188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQppM-0007IW-LT for submit@debbugs.gnu.org; Thu, 16 Sep 2021 07:45:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQppM-0001cl-DX for guix-patches@gnu.org; Thu, 16 Sep 2021 07:45:16 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:46643) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQppK-0003FM-Px for guix-patches@gnu.org; Thu, 16 Sep 2021 07:45:16 -0400 Received: by mail-wr1-x42a.google.com with SMTP id x6so8943796wrv.13 for ; Thu, 16 Sep 2021 04:45:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LS63QokjZ0Eee4pngs9yH3+sZ+7biwhUbKcojMjMmZ0=; b=eaNwkaSoz7GFE0RveokZ6sVDcuePLjLS0r1iRB4aGY4rWLWs+rljiFwWceQBiezWeX Wf2eIPxGr9d7NraNAIUNmbG1VfyYnD9Or8ftJFEF2NBYWAMOxphUn4VQle9AYhbNbDUA EGwtPKCqQoib7RGfcmm8wOoamnVc6wN2KFn2fiTjMCtNGipWBKT/oG9mYllheWBMBoo4 8iewQX/Q3vSSMhEPavmUxGR/IzwjGhiHi2Od+i5p6QbQbiVT1A27qK6ZMemMtvqklYJq WGFC41cz9DlqvE5XsMFOu9OB7Wlft43tery5faPJhzs4/oBvQdpb776mI+ubm1LPy2Dg dPEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LS63QokjZ0Eee4pngs9yH3+sZ+7biwhUbKcojMjMmZ0=; b=24BW+rcRrJJPAGNnDPY3E1969Vkrz4TJiEuzfFkfrW948A6aex7VdyqRKey8h3aTeH YOx/kIb6DKWfHVft2xvqfKNSuSYcen24UIxC8ddTuBHTS0S8oHiv374HLToMZJUFhMDH cF3wpeQ84XqWdvncdKqraiHdLPRT4WlrfQQBTD7VJPZTtKJ3Uh0Z/uMx47rJpCUTqT6R 2BD0QlvdoZInm42SYVfHJGNxb8y+rDT1gGpdSI5BFZNl0BO/I568aU2NVNCNUlUGpC/k um5YW3LPIM5brsPqbFw7k5xdMOjdRk5LKSTkRpBbthD3qeUx05cMsyLZhtQwrD65P8ti mstA== X-Gm-Message-State: AOAM532VScFySZ8L8EaR1oaoJ83mZ0pTxVMGnYS3MDKmf8X0cu4f2jyI qo1hrXGr67KdP/k+TKZOgFdbNot3oK0= X-Google-Smtp-Source: ABdhPJyby3L5/g0bskdaq/sIhqJZA4XqTLGmTxcKPhnSEk1ryY6Z9zOIh6AJ4c0wEk//uV7VLkNjgg== X-Received: by 2002:adf:e546:: with SMTP id z6mr5621365wrm.346.1631792712101; Thu, 16 Sep 2021 04:45:12 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.117]) by smtp.gmail.com with ESMTPSA id j27sm2591389wms.6.2021.09.16.04.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 04:45:11 -0700 (PDT) From: zimoun Date: Thu, 16 Sep 2021 13:45:05 +0200 Message-Id: <20210916114505.2686370-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, This patch follows the discussion from [0]. In short, it simplifies the code generating the file 'sources.json' used by Software Heritage to ingest all the tarballs. It would partially fix the issue raised here [1]. The first patch moves the duplicate of 'computed-origin-method' and adds comments. Please proof-read. :-) The second patch update the package guix. Since I cannot know the commit hash and checksum beforehand, it is set to xxxx and should be updated by the commiter. This update is necessary to get the correct Guix-as-library used by the website generator of 'sources.json', IIUC. All the best, simon 0: 1: zimoun (2): guix: packages: Document 'computed-origin-method'. gnu: guix: Update to xxxx. gnu/packages/gnuzilla.scm | 14 ++------------ gnu/packages/linux.scm | 14 ++------------ gnu/packages/package-management.scm | 6 +++--- guix/packages.scm | 23 ++++++++++++++++++++++- 4 files changed, 29 insertions(+), 28 deletions(-) base-commit: 33bc3fb2a5f30a6e21f1b8d6d43867d921bd951c