* [bug#42206] [PATCH] import: pypi: Handle 'null instead of #nil.
@ 2020-07-04 22:41 Arun Isaac
2020-07-05 7:58 ` Mathieu Othacehe
0 siblings, 1 reply; 3+ messages in thread
From: Arun Isaac @ 2020-07-04 22:41 UTC (permalink / raw)
To: 42206; +Cc: Arun Isaac
* guix/import/pypi.scm (non-empty-string-or-false): guile-json now returns
'null instead of #nil for null JSON values. Handle it.
---
guix/import/pypi.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index b20c2300f6..a2b5d995ef 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org>
+;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -63,7 +64,7 @@
(match-lambda
("" #f)
((? string? str) str)
- ((or #nil #f) #f)))
+ ((or 'null #f) #f)))
;; PyPI project.
(define-json-mapping <pypi-project> make-pypi-project pypi-project?
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#42206] [PATCH] import: pypi: Handle 'null instead of #nil.
2020-07-04 22:41 [bug#42206] [PATCH] import: pypi: Handle 'null instead of #nil Arun Isaac
@ 2020-07-05 7:58 ` Mathieu Othacehe
2020-07-05 10:42 ` bug#42206: " Arun Isaac
0 siblings, 1 reply; 3+ messages in thread
From: Mathieu Othacehe @ 2020-07-05 7:58 UTC (permalink / raw)
To: Arun Isaac; +Cc: 42206
Hello Arun,
> ((? string? str) str)
> - ((or #nil #f) #f)))
> + ((or 'null #f) #f)))
This LGTM.
Thanks,
Mathieu
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#42206: [PATCH] import: pypi: Handle 'null instead of #nil.
2020-07-05 7:58 ` Mathieu Othacehe
@ 2020-07-05 10:42 ` Arun Isaac
0 siblings, 0 replies; 3+ messages in thread
From: Arun Isaac @ 2020-07-05 10:42 UTC (permalink / raw)
To: Mathieu Othacehe; +Cc: 42206-done
[-- Attachment #1: Type: text/plain, Size: 27 bytes --]
Pushed to master, thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-05 10:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-04 22:41 [bug#42206] [PATCH] import: pypi: Handle 'null instead of #nil Arun Isaac
2020-07-05 7:58 ` Mathieu Othacehe
2020-07-05 10:42 ` bug#42206: " Arun Isaac
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).