From patchwork Sun Jan 19 23:20:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 19919 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 9D5FD17AC3; Sun, 19 Jan 2020 23:21:29 +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,FREEMAIL_FROM, T_DKIM_INVALID,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 07DEB17AB4 for ; Sun, 19 Jan 2020 23:21:29 +0000 (GMT) Received: from localhost ([::1]:55094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itJsm-00056O-C9 for patchwork@mira.cbaines.net; Sun, 19 Jan 2020 18:21:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58394) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itJsP-0004pt-5I for guix-patches@gnu.org; Sun, 19 Jan 2020 18:21:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itJsN-0001Jw-NH for guix-patches@gnu.org; Sun, 19 Jan 2020 18:21:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38165) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itJsM-0001J6-8H for guix-patches@gnu.org; Sun, 19 Jan 2020 18:21:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1itJsM-0007YZ-4h for guix-patches@gnu.org; Sun, 19 Jan 2020 18:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39197] [PATCH core-updates 1/4] gnu: RHash: Do not use git-fetch, but provide a fallback URL. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Jan 2020 23:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39197 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39197@debbugs.gnu.org Received: via spool by 39197-submit@debbugs.gnu.org id=B39197.157947601828950 (code B ref 39197); Sun, 19 Jan 2020 23:21:02 +0000 Received: (at 39197) by debbugs.gnu.org; 19 Jan 2020 23:20:18 +0000 Received: from localhost ([127.0.0.1]:44126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itJra-0007Wh-V0 for submit@debbugs.gnu.org; Sun, 19 Jan 2020 18:20:18 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:39483) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1itJrZ-0007WL-KI for 39197@debbugs.gnu.org; Sun, 19 Jan 2020 18:20:14 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 34D6F21B4C for <39197@debbugs.gnu.org>; Sun, 19 Jan 2020 18:20:08 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 19 Jan 2020 18:20:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=fm1; bh= 4yOpoyVejulUVddtSkGwoKk/doy9x+ouDGODWfsL+e0=; b=vBrzmlHNRm6DVgwc BOW8tpF4LjDikLroBS1uP8IMq6QWGrnjVc8FxGFd+OQPQ0Ry9DzgUIhc0w7Buces ZJs5ORmKiqh2Ungd12rdXaQ3M+Xj7OIe7fuzBBPtN5v2xAiASpTp+Rh6flOaBiWg ApPZ+TI+htNPEN/CH0DeErnmk5zYq7Dcq/aRONrA6csYbS3WL/mkG/7T8RqdQPQO fvwlucupLedd0yoLZai/26wuaL+bP8HniEjvMYbZyBn2iKdcRVtqEkzLH8Ej9aVm IE1CmMu5oqL8moyZQ9OXlnR1SQLVq61F/gqAiIrcaQXE7dcxp34lytymqEhXXYjF nvWJ4g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=4yOpoyVejulUVddtSkGwoKk/doy9x+ouDGODWfsL+ e0=; b=N7ZVkeOtRn45Ui0R0o3bBSlNXU50bRCcbC2DixVF8dZcHVz3b+NDX0o+Y i5DhxPdjp5CBtSf9jc8k0Jq4BmmwCUMeC3aMJFZrIbhuCvRqC+NcwnZoEG2E1wJ5 Z9DUA+LbNxFeGC4g4OEJyRUi7hjxITWZlsMqcrMdC/1KCuBMMdhNFlAvkH0hQo3t 3NGVR0/HKHNYTyXRYvLI5J7OAwhQXqaTCRdsken8fqPHG/Ou5xnAxhZ52FT9kW8i 1Zfr/Pgd7xnE+v+HMdjNplOy14/11TGVAPfaHvta2jzWb8lOIAUn+FBTh/b8DWa5 oJBFT80QbST1io6B/XChK0bpW9hmw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrudeggddtjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecufghrlhcuvffnffculddujedmnecujfgurhephffvuf ffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepofgrrhhiuhhsuceurghkkhgv uceomhgsrghkkhgvsehfrghsthhmrghilhdrtghomheqnecuffhomhgrihhnpehgihhthh husgdrtghomhdpuggvsghirghnrdhorhhgnecukfhppeekgedrvddtvddrieelrddvheef necurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtoh hmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (ti0006q161-3035.bb.online.no [84.202.69.253]) by mail.messagingengine.com (Postfix) with ESMTPA id 8447F8005A for <39197@debbugs.gnu.org>; Sun, 19 Jan 2020 18:20:07 -0500 (EST) From: Marius Bakke Date: Mon, 20 Jan 2020 00:20:03 +0100 Message-Id: <20200119232006.12303-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200119231651.11874-1-mbakke@fastmail.com> References: <20200119231651.11874-1-mbakke@fastmail.com> 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 * gnu/packages/crypto.scm (rhash)[source]: Change to URL-FETCH. --- gnu/packages/crypto.scm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 276612f887..9a545e7311 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -711,14 +712,19 @@ BLAKE.") (version "1.3.9") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/rhash/RHash") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + ;; Note: This package is a dependency of CMake, which is needed to build + ;; libjpeg-turbo and ultimately 'git-minimal', so we cannot use 'git-fetch' + ;; here. Use the generated tarball with a Debian fallback for now; upstream + ;; is aware of the problem: . + (uri (list (string-append "https://github.com/rhash/RHash/archive/v" + version ".tar.gz") + (string-append "http://ftp.debian.org/debian/pool/main/r/rhash/" + "rhash_" version ".orig.tar.gz"))) + (file-name (string-append "rhash-" version ".tar.gz")) (sha256 (base32 - "06i49x1l21h2q7pfnf4crbmjyg8b9ad0qs10ywyyn5sjpi0c21wq")))) + "1xn9fqa6rlnhsbgami45g82dlw9i1skg2sri3ydiinwak5ph1ca2")))) (build-system gnu-build-system) (arguments `(#:make-flags