Subject: Re: [bug#35518] gnu: guile-pfds bugfix

From: [email-masked]
Date: Wed, 01 May 2019 13:46:59 +0200

On 2019-05-01 08:20, Ricardo Wurmus wrote:
> 
> I’d prefer not to add a patch file here but to add a build phase after
> unpack that uses substitute* to patch the file.
> 

new patch

From de22b734f37c2701121b990fe1fda5ead67ece31 Mon Sep 17 00:00:00 2001
From: Amirouche <[email-masked]>
Date: Wed, 1 May 2019 13:41:59 +0200
Subject: [PATCH] gnu: guile-pfds bugfix

- gnu/packages/guile-xyz.scm(guile-pfds)[version]: upgrade to 0.3-0
- gnu/packages/guile-xyz.scm(guile-pfds)[commit]: hardcode v0.3
- gnu/packages/guile-xyz.scm(guile-pfds)[arguments]: New phase 'patch'
---
 gnu/packages/guile-xyz.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 03fd63837e..c2f1e2c2f3 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2016 Eraim Flashner <[email-masked]>
 ;;; Copyright © 2016, 2017 Alex Kost <[email-masked]>
 ;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <[email-masked]>
-;;; Copyright © 2016 Amirouche <[email-masked]>
+;;; Copyright © 2016, 2019 Amirouche <[email-masked]>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <[email-masked]>
 ;;; Copyright © 2017 Andy Wingo <[email-masked]>
 ;;; Copyright © 2017 David Thompson <[email-masked]>
@@ -626,13 +626,13 @@ using Guile's foreign function interface.")
 (define-public guile-pfds
   (package
     (name "guile-pfds")
-    (version "0.3")
+    (version "0.3-0")
     (home-page "https://github.com/ijp/pfds")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url home-page)
-                    (commit (string-append "v" version))))
+                    (commit "v0.3")))
               (sha256
                (base32
                 "19y33wg94pf0n98dkfqd1zbw93fgky4sawxsxl6s3vyqwl0yi5vh"))
@@ -641,7 +641,13 @@ using Guile's foreign function interface.")
     (arguments
      '(#:source-directory "src"
        #:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'move-files-around
+                  (add-after 'unpack 'patch
+                    (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.
-- 
2.19.1