From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#39197] [PATCH core-updates 1/4] gnu: RHash: Do not use git-fetch, but provide a fallback URL. Resent-Message-ID: From: Marius Bakke Date: Mon, 20 Jan 2020 00:20:03 +0100 Message-Id: <20200119232006.12303-1-mbakke@fastmail.com> In-Reply-To: <20200119231651.11874-1-mbakke@fastmail.com> References: <20200119231651.11874-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39197@debbugs.gnu.org * 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 -- 2.24.1