From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Craven Subject: [PATCH] ui: 'package->recutils' serializes the source field. Date: Fri, 5 Aug 2016 16:58:04 +0200 Message-ID: <20160805145804.26753-1-david@craven.ch> References: Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVga2-0005vZ-Dl for guix-devel@gnu.org; Fri, 05 Aug 2016 10:58:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVgZw-0002QX-D9 for guix-devel@gnu.org; Fri, 05 Aug 2016 10:58:33 -0400 Received: from so254-10.mailgun.net ([198.61.254.10]:36495) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVgZv-0002Oi-5Q for guix-devel@gnu.org; Fri, 05 Aug 2016 10:58:28 -0400 In-Reply-To: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Cc: David Craven * guix/ui.scm (package->recutils): Format origin. --- guix/ui.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/guix/ui.scm b/guix/ui.scm index 4d1b65c..e232548 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -26,6 +26,7 @@ (define-module (guix ui) #:use-module (guix utils) #:use-module (guix store) + #:use-module (guix base32) #:use-module (guix config) #:use-module (guix packages) #:use-module (guix profiles) @@ -33,6 +34,7 @@ #:use-module (guix combinators) #:use-module (guix build-system) #:use-module (guix serialization) + #:use-module (guix git-download) #:use-module ((guix build utils) #:select (mkdir-p)) #:use-module ((guix licenses) #:select (license? license-name)) #:use-module ((guix build syscalls) #:select (terminal-columns)) @@ -878,6 +880,22 @@ WIDTH columns." ;; Note: Don't i18n field names so that people can post-process it. (format port "name: ~a~%" (package-name p)) (format port "version: ~a~%" (package-version p)) + + (let ((uri (origin-uri (package-source p)))) + (cond + ((git-reference? uri) + (begin + (format port "source-git-url: ~a~%" + (git-reference-url uri)) + (format port "source-git-commit: ~a~%" + (git-reference-commit uri)) + (format port "source-git-recursive: ~a~%" + (git-reference-recursive? uri)))) + (#t + (format port "source-uri: ~a~%" uri)))) + + (format port "source-hash: ~a~%" (bytevector->base32-string + (origin-sha256 (package-source p)))) (format port "outputs: ~a~%" (string-join (package-outputs p))) (format port "systems: ~a~%" (string-join (package-transitive-supported-systems p))) -- 2.9.0