From 51194ca1e845d5f3954cb9dd1fef79e930dc3777 Mon Sep 17 00:00:00 2001
From: Amirouche <amirouche+dev@hyper.dev>
Date: Mon, 6 May 2019 14:40:42 +0200
Subject: gnu: guile-pfds: Apply a bug fix to hamts.sls.

* gnu/packages/guile-xyz.scm (guile-pfds): Remove trailing #t.
[phases]{patch-sources}: New phase.

Co-authored-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/guile-xyz.scm | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 5250540d86..40b08168df 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2016, 2019, 2020, 2021 Eraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
-;;; Copyright © 2016 Amirouche <amirouche@hypermove.net>
+;;; Copyright © 2016, 2021 Amirouche <amirouche@hypermove.net>
 ;;; Copyright © 2016, 2019 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
 ;;; Copyright © 2017 David Thompson <davet@gnu.org>
@@ -888,14 +888,23 @@ using Guile's foreign function interface.")
      '(#:source-directory "src"
        #:compile-flags '("--r6rs" "-Wunbound-variable" "-Warity-mismatch")
        #:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'move-files-around
+                  (add-after 'unpack 'patch-sources
+                    ;; Initially reported here:
+                    ;; https://github.com/ijp/pfds/pull/6, and merged into
+                    ;; other projects such as IronScheme (see:
+                    ;; https://github.com/IronScheme/pfds/pull/1).
+                    (lambda _
+                      (substitute* "hamts.sls"
+                        (("subtrie-vector vector")
+                         "subtrie-vector trie"))))
+                  (add-after 'patch-sources '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)))
+                                  (rename-file
+                                   file (string-append "src/pfds/" file)))
                                 '("bbtrees.sls"
                                   "deques"
                                   "deques.sls"
@@ -908,8 +917,7 @@ using Guile's foreign function interface.")
                                   "queues"
                                   "queues.sls"
                                   "sequences.sls"
-                                  "sets.sls"))
-                      #t)))))
+                                  "sets.sls")))))))
     (native-inputs
      `(("guile" ,guile-3.0)))
     (synopsis "Purely functional data structures for Guile")
-- 
cgit 1.4.1