From patchwork Mon May 6 12:42:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Amirouche X-Patchwork-Id: 13921 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 623B316F3A; Mon, 6 May 2019 13:43:10 +0100 (BST) 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=ham 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 10DC016F3A for ; Mon, 6 May 2019 13:43:09 +0100 (BST) Received: from localhost ([127.0.0.1]:56093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNcxY-0003Gt-96 for patchwork@mira.cbaines.net; Mon, 06 May 2019 08:43:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNcxV-0003Gc-Hq for guix-patches@gnu.org; Mon, 06 May 2019 08:43:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNcxT-0007OL-KV for guix-patches@gnu.org; Mon, 06 May 2019 08:43:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42318) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hNcxS-0007Ni-Gq for guix-patches@gnu.org; Mon, 06 May 2019 08:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hNcxS-0005DQ-9t for guix-patches@gnu.org; Mon, 06 May 2019 08:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35518] [PATCH] fix guile-pfds bug Resent-From: amirouche@hyper.dev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 May 2019 12:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35518 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Received: via spool by 35518-submit@debbugs.gnu.org id=B35518.155714657720038 (code B ref 35518); Mon, 06 May 2019 12:43:02 +0000 Received: (at 35518) by debbugs.gnu.org; 6 May 2019 12:42:57 +0000 Received: from localhost ([127.0.0.1]:55862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNcxH-0005D2-OJ for submit@debbugs.gnu.org; Mon, 06 May 2019 08:42:57 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:52845) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNcxF-0005Cr-6l for 35518@debbugs.gnu.org; Mon, 06 May 2019 08:42:50 -0400 Received: from webmail.gandi.net (webmail14.sd4.0x35.net [10.200.201.14]) (Authenticated sender: amirouche@hyper.dev) by relay6-d.mail.gandi.net (Postfix) with ESMTPA id B03CEC001F; Mon, 6 May 2019 12:42:45 +0000 (UTC) MIME-Version: 1.0 Date: Mon, 06 May 2019 14:42:45 +0200 From: amirouche@hyper.dev In-Reply-To: <871s1brg93.fsf@elephly.net> References: <141212fdb5356cbf7ad955a70bc26379@hyper.dev> <871s1brg93.fsf@elephly.net> Message-ID: <053f858c51866da5ffe2ed2b85f58d9d@hyper.dev> X-Sender: amirouche@hyper.dev User-Agent: Roundcube Webmail/1.3.8 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: , Cc: 35518@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches On 2019-05-06 13:09, Ricardo Wurmus wrote: > amirouche@hyper.dev writes: > >> Forgo the first, this patch is not perfect because It doesn't force an >> update. > > The attached patch is more than 15MB in size. I haven’t looked at it > but I guess that’s not correct. I am not sure which patch you are referring to. Here is another patch. I followed the "Submitting Patches" section from the manual. From 50f143b119d42042009fb94e5d6a74d47740f6d2 Mon Sep 17 00:00:00 2001 From: Amirouche Date: Mon, 6 May 2019 14:40:42 +0200 Subject: [PATCH] gnu: guile-pfds bugfix - gnu/packages/guile-xyz.scm(guile-pfds)[version]: add revision 1 - gnu/packages/guile-xyz.scm(guile-pfds)[arguments]: New phase 'patch' --- gnu/packages/guile-xyz.scm | 121 ++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 56 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 03fd63837e..f80cd72442 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 Eraim Flashner ;;; Copyright © 2016, 2017 Alex Kost ;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira -;;; Copyright © 2016 Amirouche +;;; Copyright © 2016, 2019 Amirouche ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2017 David Thompson @@ -624,60 +624,69 @@ using Guile's foreign function interface.") (license license:gpl3+))) (define-public guile-pfds - (package - (name "guile-pfds") - (version "0.3") - (home-page "https://github.com/ijp/pfds") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (sha256 - (base32 - "19y33wg94pf0n98dkfqd1zbw93fgky4sawxsxl6s3vyqwl0yi5vh")) - (file-name (string-append name "-" version "-checkout")))) - (build-system guile-build-system) - (arguments - '(#:source-directory "src" - #:phases (modify-phases %standard-phases - (add-after 'unpack 'move-files-around - (lambda _ - ;; Move files under a pfds/ directory to reflect the - ;; module hierarchy. - (mkdir-p "src/pfds") - (for-each (lambda (file) - (rename-file file - (string-append "src/pfds/" - file))) - '("bbtrees.sls" - "deques" - "deques.sls" - "dlists.sls" - "fingertrees.sls" - "hamts.sls" - "heaps.sls" - "private" - "psqs.sls" - "queues" - "queues.sls" - "sequences.sls" - "sets.sls")) - - ;; In Guile <= 2.2.4, there's no way to tell 'guild - ;; compile' to accept the ".sls" extension. So... - (for-each (lambda (file) - (rename-file file - (string-append - (string-drop-right file 4) - ".scm"))) - (find-files "." "\\.sls$")) - #t))))) - (native-inputs - `(("guile" ,guile-2.2))) - (synopsis "Purely functional data structures for Guile") - (description - "This package provides purely functional data structures written in R6RS + (let ((commit "454033f82dac7c0b0ea9e84eed1e8ed316487c78") + (revision "1")) + (package + (name "guile-pfds") + (version (git-version "0.3" revision commit)) + (home-page "https://github.com/ijp/pfds") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (sha256 + (base32 + "19y33wg94pf0n98dkfqd1zbw93fgky4sawxsxl6s3vyqwl0yi5vh")) + (file-name (git-file-name name version)))) + (build-system guile-build-system) + (arguments + '(#:source-directory "src" + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch + ;; note: upstream is not responsive. + (lambda _ + (substitute* "hamts.sls" + (("subtrie-vector vector") + "subtrie-vector trie")) + #t)) + (add-after 'patch 'move-files-around + (lambda _ + ;; Move files under a pfds/ directory to reflect the + ;; module hierarchy. + (mkdir-p "src/pfds") + (for-each (lambda (file) + (rename-file file + (string-append "src/pfds/" + file))) + '("bbtrees.sls" + "deques" + "deques.sls" + "dlists.sls" + "fingertrees.sls" + "hamts.sls" + "heaps.sls" + "private" + "psqs.sls" + "queues" + "queues.sls" + "sequences.sls" + "sets.sls")) + + ;; In Guile <= 2.2.4, there's no way to tell 'guild + ;; compile' to accept the ".sls" extension. So... + (for-each (lambda (file) + (rename-file file + (string-append + (string-drop-right file 4) + ".scm"))) + (find-files "." "\\.sls$")) + #t))))) + (native-inputs + `(("guile" ,guile-2.2))) + (synopsis "Purely functional data structures for Guile") + (description + "This package provides purely functional data structures written in R6RS Scheme and compiled for Guile. It has been tested with Racket, Guile 2, Vicare Scheme and IronScheme. Right now it contains: @@ -693,7 +702,7 @@ Vicare Scheme and IronScheme. Right now it contains: @item heaps @item hash array mapped tries (HAMTs). @end itemize\n") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public guile-aa-tree (package -- 2.19.1