From patchwork Tue Nov 2 16:48:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 34214 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 2170527BBE3; Tue, 2 Nov 2021 16:49:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9653927BBE1 for ; Tue, 2 Nov 2021 16:49:14 +0000 (GMT) Received: from localhost ([::1]:57464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhwyG-0003wW-A8 for patchwork@mira.cbaines.net; Tue, 02 Nov 2021 12:49:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhwy6-0003qy-Hi for guix-patches@gnu.org; Tue, 02 Nov 2021 12:49:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhwy6-0006kC-7F for guix-patches@gnu.org; Tue, 02 Nov 2021 12:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mhwy5-0004cS-VI for guix-patches@gnu.org; Tue, 02 Nov 2021 12:49:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51570] [PATCH] build-system: haskell: Add =?utf-8?b?4oCYaGFj?= =?utf-8?b?a2FnZS11cmnigJk=?= procedure. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Nov 2021 16:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51570@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163587170917702 (code B ref -1); Tue, 02 Nov 2021 16:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Nov 2021 16:48:29 +0000 Received: from localhost ([127.0.0.1]:37923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhwxZ-0004bS-7v for submit@debbugs.gnu.org; Tue, 02 Nov 2021 12:48:29 -0400 Received: from lists.gnu.org ([209.51.188.17]:57562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhwxX-0004bK-Kh for submit@debbugs.gnu.org; Tue, 02 Nov 2021 12:48:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhwxX-0002qQ-4y for guix-patches@gnu.org; Tue, 02 Nov 2021 12:48:27 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:38528 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhwxS-0006Sw-UH for guix-patches@gnu.org; Tue, 02 Nov 2021 12:48:25 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1635871690; bh=tp4ATTPa+guOMa8We1mOXufvp8ymh0cQvJ5gIPOpXRM=; h=From:To:Subject:Date; b=IYXgSYjfhYBdz60YLPW7McQBlcJPYG+fCjAXo50M9uRnhm+wag/9NjD5mlcX5clWU D2sSRTuJ1CwKSVX5jSAxezPksz3NnKmoc69/b/3DPp5wJ01QyhmQFNVLIKuksl5EHR yxl4lx43hcUD6jjFc31zK43/OOfCtLfkNnvGSqKM= Message-Id: <30e3db0aca5699b7d42f7107723e9dde4f16a5f7.1635871607.git.public@yoctocell.xyz> Date: Tue, 02 Nov 2021 17:48:09 +0100 MIME-Version: 1.0 Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.001, FROM_SUSPICIOUS_NTLD_FP=1.688, PDS_OTHER_BAD_TLD=0.001, PDS_RDNS_DYNAMIC_FP=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TO_NO_BRKTS_DYNIP=0.25 autolearn=no autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/build-system/haskell (hackage-uri): New procedure. * guix/import/hackage.scm (hackage-module->sexp, latest-release): Use it. * tests/hackage.scm (match-ghc-foo, match-ghc-foo-6, match-ghc-foo-revision, match-ghc-foo-import): Adjust accordingly. --- guix/build-system/haskell.scm | 7 +++++++ guix/import/hackage.scm | 4 ++-- tests/hackage.scm | 20 ++++---------------- 3 files changed, 13 insertions(+), 18 deletions(-) base-commit: 0e19713c1fbfd3a01347e0d490434a53a596ed3c diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm index 18a584f782..48f3452931 100644 --- a/guix/build-system/haskell.scm +++ b/guix/build-system/haskell.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2020 Timothy Sample ;;; Copyright © 2020 Simon Tournier +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,12 @@ (define-module (guix build-system haskell) ;; ;; Code: +(define (hackage-uri name version) + "Return a URI string for the Haskell package hosted on Hackage corresponding +to NAME and VERSION." + (string-append "https://hackage.haskell.org/package/" name "/" + name "-" version ".tar.gz")) + (define %haskell-build-system-modules ;; Build-side modules imported by default. `((guix build haskell-build-system) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 03881f1a3d..51581f15d7 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -303,7 +303,7 @@ (define (maybe-arguments) (version ,version) (source (origin (method url-fetch) - (uri (string-append ,@(factorize-uri source-url version))) + (uri (hackage-uri ,name version)) (sha256 (base32 ,(if tarball @@ -367,7 +367,7 @@ (define (latest-release package) (hackage-cabal-url hackage-name)) #f) ((_ *** ("version" (version))) - (let ((url (hackage-source-url hackage-name version))) + (let ((url (hackage-uri hackage-name version))) (upstream-source (package (package-name package)) (version version) diff --git a/tests/hackage.scm b/tests/hackage.scm index aca807027c..ba694661f3 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -170,10 +170,7 @@ (define-package-matcher match-ghc-foo ('source ('origin ('method 'url-fetch) - ('uri ('string-append - "https://hackage.haskell.org/package/foo/foo-" - 'version - ".tar.gz")) + ('uri ('hackage-uri "foo" 'version)) ('sha256 ('base32 (? string? hash))))) @@ -215,10 +212,7 @@ (define-package-matcher match-ghc-foo-6 ('source ('origin ('method 'url-fetch) - ('uri ('string-append - "https://hackage.haskell.org/package/foo/foo-" - 'version - ".tar.gz")) + ('uri ('hackage-uri "foo" 'version)) ('sha256 ('base32 (? string? hash))))) @@ -343,10 +337,7 @@ (define-package-matcher match-ghc-foo-revision ('source ('origin ('method 'url-fetch) - ('uri ('string-append - "https://hackage.haskell.org/package/foo/foo-" - 'version - ".tar.gz")) + ('uri ('hackage-uri "foo" 'version)) ('sha256 ('base32 (? string? hash))))) @@ -409,10 +400,7 @@ (define-package-matcher match-ghc-foo-import ('source ('origin ('method 'url-fetch) - ('uri ('string-append - "https://hackage.haskell.org/package/foo/foo-" - 'version - ".tar.gz")) + ('uri ('hackage-uri "foo" 'version)) ('sha256 ('base32 (? string? hash)))))