From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id sHkDD/ZO8GGM7AAAgWs5BA (envelope-from ) for ; Tue, 25 Jan 2022 20:26:46 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id kI5DDPZO8GEPXgEA9RJhRA (envelope-from ) for ; Tue, 25 Jan 2022 20:26:46 +0100 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 DF31AC688 for ; Tue, 25 Jan 2022 20:26:45 +0100 (CET) Received: from localhost ([::1]:49762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nCRSn-0005XT-4R for larch@yhetil.org; Tue, 25 Jan 2022 14:26:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCRPD-00047a-VQ for guix-patches@gnu.org; Tue, 25 Jan 2022 14:23:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57254) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nCRPD-0000BE-Lv for guix-patches@gnu.org; Tue, 25 Jan 2022 14:23:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nCRPD-0001Ew-JG for guix-patches@gnu.org; Tue, 25 Jan 2022 14:23:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52555] [RFC PATCH v2 4/5] publish: Add support for storing ERIS encoded blocks to IPFS. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Jan 2022 19:23:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52555 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52555@debbugs.gnu.org Cc: pukkamustard , ~pukkamustard/eris@lists.sr.ht Received: via spool by 52555-submit@debbugs.gnu.org id=B52555.16431385634686 (code B ref 52555); Tue, 25 Jan 2022 19:23:03 +0000 Received: (at 52555) by debbugs.gnu.org; 25 Jan 2022 19:22:43 +0000 Received: from localhost ([127.0.0.1]:50150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCROt-0001DQ-8v for submit@debbugs.gnu.org; Tue, 25 Jan 2022 14:22:43 -0500 Received: from mout02.posteo.de ([185.67.36.66]:59993) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCROd-0001CH-SK for 52555@debbugs.gnu.org; Tue, 25 Jan 2022 14:22:28 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 4C66F240103 for <52555@debbugs.gnu.org>; Tue, 25 Jan 2022 20:22:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1643138542; bh=WjdsN5qtP47bgM3Qv/+NX+Fy8ZzMEmAQi9X/KFRZPLo=; h=From:To:Cc:Subject:Date:From; b=QlZsIs6HZgRLJycSuQJN9og4N1nW8ttJnDB8/C1w9CfdkTH18W0i6o1cj1enMolVg psxeNyntX7MBIcBMHLjeFdKe0d8JYP+pmvcLNn2FKoiS5XP+Xnl+TYjQYfylPHUo65 iX+hB9mXQVP1XmxFngAb4CwoYji/B3RQ/p/FrlkBjlsGgjM8noz0jfq8g5nBg2rfmN WvkKaLA8lTM9oHN6OOPU4JibOgz5IqF+d0OWx8G3+5w4OlVG44iC70tsYYVinRHFl3 tjmeTxbM6FT8TMZ4tZj8YXOaTo/Gz/btZ3qd8srheuo5Wr4No9TYT8reev2mVywF+r XbIa2SwyoD0Cg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JjxZ54K7cz9rxS; Tue, 25 Jan 2022 20:22:21 +0100 (CET) From: pukkamustard Date: Tue, 25 Jan 2022 19:22:00 +0000 Message-Id: <20220125192201.7582-5-pukkamustard@posteo.net> In-Reply-To: <20220125192201.7582-1-pukkamustard@posteo.net> References: <20220125192201.7582-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1643138805; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=IOF2OqzZacS3wHrGBVvhQMTSf/cSKbAO1PloxpPCCM8=; b=qJx7WAXqQxK/wqUg52e4foewVZOJyz9HIxPs+GA1nS2Oh7ac7/SdAL8rrkPtkE4lUsQ99U D0rXhGOMqIv4oB72jRd9PSXujoTelm6+cfXNPgFJ3YqxWlD/rQvZdFaQOLcZ0MMArAFG5F djs01LcNK3Hb07QuTY6cOZ3VEE7jaFo5ifqGXFC0kAviKZwn9KJTWFFxZw4ZlWXovDFHO4 b5FtRqSiqUO9VijTihFx8b40UqNrt6D0W1nyn4ONlodKmWYZLmoAs4s5c1QKDD4/U/Qa6x FuvyQadckO9hO+cYWETyoiKdM9+UiO7O0QmZ4DaWTp3/Rmp9LOSI7bdms8ro+g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1643138805; a=rsa-sha256; cv=none; b=OJnC7nzssTPdhOQs/4jD/UtqLFgstY5Pqq10AS+ParuTdGyGWz4MzQb5K0tIixQdZkITQn ECbVd8H6BrSpBqtXqdjQl2otX/8srKGr4OYSV9BNbjhcbLgbsQW68jyBQWvOZt9KZXDEU2 a9IzzeXWaO6OSg714inqKkZ0vwsNam+cpMS2V4odNt2wmINX7Lma1z7p9zzmkbHdsBjWH3 xf00EbWqxz9c4G+QmnxfMHxy9cBvr4Fg8F2rS5KOapnX6UTVz8AeydklsT/8vjyFQ1OEPf kR18S6x39omYuf7sJ3hx9xmnIkaBanP4rYzqnyBKRZThxkRn2fDQnc3N3JcqVw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=QlZsIs6H; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.73 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=QlZsIs6H; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: DF31AC688 X-Spam-Score: -0.73 X-Migadu-Scanner: scn0.migadu.com X-TUID: UUbMRMhfJZ0C * guix/scripts/publish.scm (bake-narinfo+nar): Use guix-eris-block-reducer from (guix eris). --- guix/scripts/publish.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index 9c83f5183d..556107ab7d 100644 --- a/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm @@ -41,6 +41,7 @@ (define-module (guix scripts publish) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-37) + #:use-module (srfi srfi-71) #:use-module (web http) #:use-module (web request) #:use-module (web response) @@ -58,6 +59,7 @@ (define-module (guix scripts publish) #:use-module (guix workers) #:use-module (guix store) #:use-module ((guix serialization) #:select (write-file)) + #:use-module (guix eris) #:use-module (eris) #:use-module (zlib) #:autoload (lzlib) (call-with-lzip-output-port @@ -644,8 +646,14 @@ (define (eris-encode-nar compressions) (stat (stat nar #f))) (and stat (call-with-input-file nar - (cut eris-encode->string <> - #:block-size %eris-block-size-large)))))) + (lambda (port) + (let ((eris-urn _ + (eris-encode port + #:block-size + %eris-block-size-large + #:block-reducer + guix-eris-block-reducer))) + (uri->string eris-urn)))))))) (let ((compression (actual-compressions item compressions))) -- 2.34.0