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 ms0.migadu.com with LMTPS id 4AXxFKuHeWF9ZgAAgWs5BA (envelope-from ) for ; Wed, 27 Oct 2021 19:08:59 +0200 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 oJ6XEKuHeWHdWwAAbx9fmQ (envelope-from ) for ; Wed, 27 Oct 2021 17:08:59 +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 CF1CF3D21 for ; Wed, 27 Oct 2021 19:08:58 +0200 (CEST) Received: from localhost ([::1]:45906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfmQ5-0007qX-0F for larch@yhetil.org; Wed, 27 Oct 2021 13:08:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfm03-0007cN-FI for guix-patches@gnu.org; Wed, 27 Oct 2021 12:42:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfm02-0003V7-2X for guix-patches@gnu.org; Wed, 27 Oct 2021 12:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfm02-0005Oc-0X for guix-patches@gnu.org; Wed, 27 Oct 2021 12:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51441] [PATCH] substitutes: keep base's uri-path for Properly construct URL. References: In-Reply-To: Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 16:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51441 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51441@debbugs.gnu.org Received: via spool by 51441-submit@debbugs.gnu.org id=B51441.163535291120718 (code B ref 51441); Wed, 27 Oct 2021 16:42:01 +0000 Received: (at 51441) by debbugs.gnu.org; 27 Oct 2021 16:41:51 +0000 Received: from localhost ([127.0.0.1]:50432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mflzm-0005Nz-Ac for submit@debbugs.gnu.org; Wed, 27 Oct 2021 12:41:51 -0400 Received: from out162-62-57-64.mail.qq.com ([162.62.57.64]:35261) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1mflzh-0005Ne-GW for 51441@debbugs.gnu.org; Wed, 27 Oct 2021 12:41:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1635352892; bh=nYFI+5UuM6cHMjoG2XUxWV20MgcbB/LAzMzpA0jBiNY=; h=From:To:Subject:Date; b=buzZIVmB1SbpGmdDYCbocQI8Oe92w/0PqprDR7PbV3Rz3X0EEfIqPERkwW4O/fMM/ g8HpzwN3s3eo8ObUt0kBvVV4N+qywuzDSgT13AeCqunGjuxu2AHbGlVSriOvcrbdtP gSQNPOEDEQ3PFyWgkysqREt+XGTg0HLqRW4kQ678= Received: from asus ([2409:8928:124e:600:171f:1b40:5859:701f]) by newxmesmtplogicsvrsza9.qq.com (NewEsmtp) with SMTP id A5888260; Thu, 28 Oct 2021 00:41:24 +0800 X-QQ-mid: xmsmtpt1635352884t1echus9b Message-ID: X-QQ-XMAILINFO: MklzYC+sb6GFtIugkQMcybWRoFBrqy9fNILSF1ZNnY3W0c9vCUL7Dw6osuubry zW7rJjs2MX6Ugjh64WgB9wN9+6oa9X4aupaSejGeFVFrQuEX2G7okTEfgBnKVeVaDq5gw4SG2sNN IYA8DKCHtjJlqevM/yrz1ub+kyc/e8X84eSVfxg61T1CuoPxAtqbN9ioqiTI1b9NZ/ZZ+ODu3lQ3 yumgvyjluw9/xg/PfXhtpMFk8a8crR9yC6jedHn9MJj6UEWxKWdpUtSJLREgLzc682tTKhOmoDL8 VH+RVwSfNEcWE8HiQ2Zok/6yhQePHXm54QG3zZMqQKM57h7IYtP5T/x11cs38r76fxeVZGLzBC+p zIuQX2yfcW0FOTO3N3HGdDrgJ2rr4oDnfgQaMOS7dU+rryfGEytQbUYbNbIMnsWYhdaXa9NXZCYz tXQ0yx/fxQ3FBI09jY4LpkEaQzb9NLAjfMulZqofIYHcWoc51XXaTfUZ73oLhIyGFhvrHud2dUxp gxhalVrg1S9ZRFOXGRTJlX4vQiaA5GoQks/UkCT2Bo00xGadiRETRtuZQo1jZNcfAIWQESjfPmlq xZyh6+G7whr96K4oY2MPkADwUdwdUuUsAP2CP95VruoFWhqVcSZp9tw9DJIFuG76aN+gQ9PgueGG IL23ZHrdGlbJn2EOKhPfvVGkndq6T3+GYXPnG2/tJvZ/9rvxLVaUmaBh/s33nrCPeqQyGw/fcnHN 2aiiltFP/50aPpfA1pw50LsadeBcuwHBsSbhhutcvv9qgGUP8bcUygH8IL0GTnr+p3p0f3Qz6eoZ e5uWFTfyEq7w== User-agent: mu4e 1.6.6; emacs 28.0.50 Date: Thu, 28 Oct 2021 00:37:52 +0800 Message-ID: <87fssmwhcc.fsf@qq.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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" Reply-to: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches From: Z572 via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635354538; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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=nYFI+5UuM6cHMjoG2XUxWV20MgcbB/LAzMzpA0jBiNY=; b=FYK4evtkMbi306oKGs2PD8bF64AUCuVUwdy4X766NNAxFErSKdC7xDOeosi4/1l3uLPFmi 4gMi7v130MEDGBS4RpSZercH6LoBo1+Euv0PUyN53q+wJpEgNK03zvmV1wwT5mfYe+0wGO p7W8XZ/Hyue39hJ+eLXiLHc4+kdwzGsZaN0BToO6VgcKgyRmfL7CheCCKh+FXgZaD7fE1o ltiZNaeOfnuFfocEpue7Vmlzi0EkoNQ19O9s6KHG2l3YYb6AJnGUZyhMbtB9FxsVi9IQ+K riyG/C1QLCjLvpQxZxF3OvqW97+epsYbuekNsD4yMWJH7meTb02j09V0EIF8kw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635354538; a=rsa-sha256; cv=none; b=OEcVvwzGlxE8A46lH9E1X0YY9+oaSl8bgyhd9OkdLSjzYyALCbCL0Rg/e0lWztrRWBwyYy ESbuNfPUKYKKlDVmqqgUVL7XGxBLHFQy6TxD7fD2+jRzONhgplD2VEORun8G4MJdhueXXu uW1il/OFsBW/jwJykpFjFS3JtxotBFGPsxuvk7DZ6QKmaKGbfRo6u45wFdz7shlvvWY6S+ 4tY+vR58WojnrmtAp3iBHeTpuG5tgQwxSWk2U1EA5AQKvmdMxMN0boXp947oaJoNgqbhD2 qFbok4TQ5TuwOqFs7sTK9LBMeydWnunHAWX0HNEOUqql6bOhzvhmzGpHdrCoGg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=buzZIVmB; dmarc=pass (policy=none) header.from=gnu.org; 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-Migadu-Spam-Score: 3.47 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=buzZIVmB; dmarc=pass (policy=none) header.from=gnu.org; 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-Migadu-Queue-Id: CF1CF3D21 X-Spam-Score: 3.47 X-Migadu-Scanner: scn0.migadu.com X-TUID: BnyhMjdapOk1 it just fix fetch narinfos url, substitute still don't download, later i will try fix it. Z572 via Guix-patches via writes: > Hello, > > Sorry for my english, and i'm not sure ChangeLog is right. > > https://mirror.sjtu.edu.cn/guix use customize script to mirror official > substitutes server, at /guix not in / . narinfo-request will forget add = /guix to url, so i > can't use substitutes from them, this patch fix it. > > From 7fe17965d5336d55ec8b1b7471cbbb34b12e9a0b Mon Sep 17 00:00:00 2001 > From: Z572 <873216071@qq.com> > Date: Wed, 27 Oct 2021 21:28:24 +0800 > Subject: [PATCH] substitutes: keep base's uri-path for Properly construct= URL. > > substitutes (narinfo-request): keep BASE's uri-path for properly construc= t url. > > some substitutes server don't use guix publish, them use customize script= s to > mirror official server, if them look likes https://example.com/guix , > narinfo-request will lost /guix . > --- > guix/substitutes.scm | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/guix/substitutes.scm b/guix/substitutes.scm > index a5c554acff..bfbd29623e 100644 > --- a/guix/substitutes.scm > +++ b/guix/substitutes.scm > @@ -3,6 +3,7 @@ > ;;; Copyright =C2=A9 2014 Nikita Karetnikov > ;;; Copyright =C2=A9 2018 Kyle Meyer > ;;; Copyright =C2=A9 2020 Christopher Baines > +;;; Copyright =C2=A9 2021 Zheng Junjie <873216071@qq.com> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -158,7 +159,8 @@ (define (narinfo-request cache-url path) > "Return an HTTP request for the narinfo of PATH at CACHE-URL." > (let* ((base (string->uri cache-url)) > (ref (build-relative-ref > - #:path (string-append (store-path-hash-part path) ".narin= fo"))) > + #:path (string-append (uri-path base) "/" > + (store-path-hash-part path) ".narin= fo"))) > (url (resolve-uri-reference ref base)) > (headers '((User-Agent . "GNU Guile")))) > (build-request url #:method 'GET #:headers headers))) > --=20 > 2.33.1 --=20 over