From patchwork Mon Jan 7 10:48:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 695 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 88EFC16A27; Mon, 7 Jan 2019 10:50:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 40F5716A27 for ; Mon, 7 Jan 2019 10:50:23 +0000 (GMT) Received: from localhost ([127.0.0.1]:32945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggSUA-00081X-OV for patchwork@mira.cbaines.net; Mon, 07 Jan 2019 05:50:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggSTw-0007y7-4U for guix-patches@gnu.org; Mon, 07 Jan 2019 05:50:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggSTq-0002qt-K6 for guix-patches@gnu.org; Mon, 07 Jan 2019 05:50:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48397) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggSTq-0002qp-HI for guix-patches@gnu.org; Mon, 07 Jan 2019 05:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ggSTq-0004Iq-EU for guix-patches@gnu.org; Mon, 07 Jan 2019 05:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34007] [PATCH 3/5] download: Remove Guile 2.0 workaround. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Jan 2019 10:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34007 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34007@debbugs.gnu.org Received: via spool by 34007-submit@debbugs.gnu.org id=B34007.154685815316448 (code B ref 34007); Mon, 07 Jan 2019 10:50:02 +0000 Received: (at 34007) by debbugs.gnu.org; 7 Jan 2019 10:49:13 +0000 Received: from localhost ([127.0.0.1]:47671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ggST2-0004H8-Vh for submit@debbugs.gnu.org; Mon, 07 Jan 2019 05:49:13 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:60140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ggSSw-0004GX-0v for 34007@debbugs.gnu.org; Mon, 07 Jan 2019 05:49:06 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 4AF18774; Mon, 7 Jan 2019 11:49:05 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ouaKHIfZFGQN; Mon, 7 Jan 2019 11:49:04 +0100 (CET) Received: from gnu.org (unknown [IPv6:2001:660:6102:320:e120:2c8f:8909:cdfe]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 0D550E93; Mon, 7 Jan 2019 11:49:03 +0100 (CET) From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 7 Jan 2019 11:48:55 +0100 Message-Id: <20190107104857.6456-3-ludo@gnu.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190107104857.6456-1-ludo@gnu.org> References: <20190107104857.6456-1-ludo@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 * guix/build/download.scm: Remove Guile 2.0 workaround. --- guix/build/download.scm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/guix/build/download.scm b/guix/build/download.scm index 199702a679..24b5aa378f 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -504,18 +504,6 @@ port if PORT is a TLS session record port." (module-set! (resolve-module '(web http)) 'parse-rfc-822-date parse-rfc-822-date)) -;; XXX: Work around , present in Guile -;; up to 2.0.11. -(unless (or (> (string->number (major-version)) 2) - (> (string->number (minor-version)) 0) - (> (string->number (micro-version)) 11)) - (let ((var (module-variable (resolve-module '(web http)) - 'declare-relative-uri-header!))) - ;; If 'declare-relative-uri-header!' doesn't exist, forget it. - (when (and var (variable-bound? var)) - (let ((declare-relative-uri-header! (variable-ref var))) - (declare-relative-uri-header! "Location"))))) - ;; XXX: Work around broken proxy handling on Guile 2.2 <= 2.2.2, fixed in ;; Guile commits 7d0d9e2c25c1e872cfc7d14ab5139915f1813d56 and ;; 6ad28ae3bc6a6d9e95ab7d70510d12c97673a143. See bug report at