From ea6f4ee097bffacc33a98e462bdec58920d823b5 Mon Sep 17 00:00:00 2001 From: Evgeny Pisemsky Date: Tue, 1 Apr 2025 01:52:51 +0300 Subject: [PATCH] import: pypi: Fix null at home-page. Reported in #73314: PyPI importer gives null at home-page for some packages. * guix/import/pypi.scm (): [home-page]: Apply NON-EMPTY-STRING-OR-FALSE to make it consistence with similar fields, covering the case when PyPI's JSON file metadata file does not have the information. Change-Id: I501582988cf58b00bd201c12ad47e9b095988fae Reported-by: Evgeny Pisemsky Reviewed-by: Simon Tournier Signed-off-by: Sharlatan Hellseher --- guix/import/pypi.scm | 4 ++-- guix/packages.scm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 9a40dea1c13..dd43ebdcf3d 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -116,8 +116,8 @@ (license project-info-license) ;string (download-url project-info-download-url ;string | #f "download_url" non-empty-string-or-false) - (home-page project-info-home-page ;string - "home_page") + (home-page project-info-home-page ;string | #f + "home_page" non-empty-string-or-false) (url project-info-url "project_url") ;string (release-url project-info-release-url "release_url") ;string (version project-info-version)) ;string diff --git a/guix/packages.scm b/guix/packages.scm index 70ccd8a924c..18ab23e0aa6 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -651,7 +651,7 @@ Texinfo. Otherwise, return the string." (sanitize validate-texinfo)) ; one or two paragraphs (license package-license ; (list of) (sanitize validate-license)) - (home-page package-home-page) ; string + (home-page package-home-page) ; string | #f (supported-systems package-supported-systems ; list of strings (default %supported-systems))