From: amirouche@hyper.dev
To: Ricardo Wurmus <rekado@elephly.net>
Cc: 35518@debbugs.gnu.org
Subject: [bug#35518] gnu: guile-pfds bugfix
Date: Wed, 01 May 2019 13:46:59 +0200 [thread overview]
Message-ID: <3279cee19940b90be0bbe34b6619fe89@hyper.dev> (raw)
In-Reply-To: <87imuuvgpd.fsf@elephly.net>
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-guile-pfds-bugfix.patch --]
[-- Type: text/x-diff; name=0001-gnu-guile-pfds-bugfix.patch, Size: 2487 bytes --]
From de22b734f37c2701121b990fe1fda5ead67ece31 Mon Sep 17 00:00:00 2001
From: Amirouche <amirouche+dev@hyper.dev>
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 <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, 2019 Amirouche <amirouche@hypermove.net>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017 David Thompson <davet@gnu.org>
@@ -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
next prev parent reply other threads:[~2019-05-01 11:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-01 0:52 [bug#35518] gnu: guile-pfds bugfix amirouche
2019-05-01 3:42 ` [bug#35518] (no subject) amirouche
2019-05-06 11:09 ` Ricardo Wurmus
2019-05-06 12:42 ` [bug#35518] [PATCH] fix guile-pfds bug amirouche
2019-05-06 13:10 ` Ricardo Wurmus
2021-07-14 2:43 ` bug#35518: gnu: guile-pfds bugfix Maxim Cournoyer
2019-05-01 6:20 ` [bug#35518] " Ricardo Wurmus
2019-05-01 10:58 ` amirouche
2019-05-01 11:46 ` amirouche [this message]
2019-05-06 8:05 ` Ludovic Courtès
2019-05-06 8:05 ` Ludovic Courtès
2019-06-26 1:47 ` [bug#35518] upstream unresponsive Amirouche
2020-06-06 3:33 ` [bug#35518] guile-pfds hamts fix Jack Hill
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3279cee19940b90be0bbe34b6619fe89@hyper.dev \
--to=amirouche@hyper.dev \
--cc=35518@debbugs.gnu.org \
--cc=rekado@elephly.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).