From patchwork Mon Aug 12 15:12:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Nicol=C3=B2_Balzarotti?= X-Patchwork-Id: 14915 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9AFC91724B; Mon, 12 Aug 2019 16:13:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, HTML_MESSAGE,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 572CF1723E for ; Mon, 12 Aug 2019 16:13:08 +0100 (BST) Received: from localhost ([::1]:46318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxC0R-0002wB-Uw for patchwork@mira.cbaines.net; Mon, 12 Aug 2019 11:13:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40940) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxC0N-0002vt-RX for guix-patches@gnu.org; Mon, 12 Aug 2019 11:13:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxC0M-0006Ru-MX for guix-patches@gnu.org; Mon, 12 Aug 2019 11:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38495) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hxC0M-0006Rl-I8 for guix-patches@gnu.org; Mon, 12 Aug 2019 11:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hxC0M-0001qc-BN for guix-patches@gnu.org; Mon, 12 Aug 2019 11:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37010] Fix field exported as lists References: In-Reply-To: Resent-From: =?utf-8?q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Aug 2019 15:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37010 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 37010@debbugs.gnu.org Received: via spool by 37010-submit@debbugs.gnu.org id=B37010.15656227487060 (code B ref 37010); Mon, 12 Aug 2019 15:13:02 +0000 Received: (at 37010) by debbugs.gnu.org; 12 Aug 2019 15:12:28 +0000 Received: from localhost ([127.0.0.1]:47316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hxBzn-0001po-I5 for submit@debbugs.gnu.org; Mon, 12 Aug 2019 11:12:27 -0400 Received: from mail-ot1-f44.google.com ([209.85.210.44]:43301) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hxBzl-0001pZ-SQ for 37010@debbugs.gnu.org; Mon, 12 Aug 2019 11:12:26 -0400 Received: by mail-ot1-f44.google.com with SMTP id e12so15755667otp.10 for <37010@debbugs.gnu.org>; Mon, 12 Aug 2019 08:12:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=gRqZBZ6srsSlcBe8bJCfJtgoR8fIrV6GGjSIExI76gY=; b=cIuilPnxwTZUzUGPvOaHiS6F1qkA9n8b3tNdRo2BGAGA2687AG3ltCA92X/FxjhRsc Kam7dL5Cm7S25sIQwll+Hwglmo/+H7Tr1nszIOaWhFu+CoizcTLlnwVH14D/3bgQzFev DqTYW5yFJRqSaPKThztz9p+j41wcdljchGkhUE18zajY3fZ2S8D0PLLbUOV/xGCnSz2S c6jAH9AoX/eC0ColSl7xzpDPJFE/2DQBPWCw662DJZ4py+tOtwS5XNpRn84oHCyhaNNs itVBh0HWpbsEuT+0HWdbYC94faDhB49iUXHPpwCVjUho7gkQab6cj4ic3AGtUYrygoEa 5JNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=gRqZBZ6srsSlcBe8bJCfJtgoR8fIrV6GGjSIExI76gY=; b=NrTGEgxaMA9tur07jHA0UfoxaT9MmLm3ROIYaHyGo6Q+1fcwcrh4Uc+LvKLPnGbU8K 3aaDirhe8UPOxuf2ZAaHDc60WrxnJShL1yKpFdrf2iR4IMP32UAyQCx26XSVM07WxfFk 7Io42x3W3g9moMloq+CyyUVXsraRQso+kxYwxEtvfIdRt1NHGx/OjbQW9PQqtzh0r29J c3fUpqHcrMOgulidFk5nDeVvcUCP6xw5u2pmdSHE/Y/+qO2TWWnOPHP2zV2aNbk/Nnrv 2zHsvVKcTihCOggXZO/DXukvot+zdpinaL3jdTZGJk2IwYwIJ95Z/d4wCbjdRZQHxfai 6tDg== X-Gm-Message-State: APjAAAWAhbzZAw2bOwlQmduyjvWMLchaLqyJRhP5nH2q9nPatNo0N60r 2Jt3kXq7hPmJQEBss91GnSaWBzizdwoQHlqNOvIQFQ== X-Google-Smtp-Source: APXvYqzRujApIBGlQDmbC9jsPxuTn1E3tS1ZwvEkX3nZDk1+0noAlGS857JHBm3bNufsetNHndnbnuqhdFFk168PSuY= X-Received: by 2002:a02:b609:: with SMTP id h9mr37248060jam.36.1565622739803; Mon, 12 Aug 2019 08:12:19 -0700 (PDT) MIME-Version: 1.0 From: =?utf-8?q?Nicol=C3=B2?= Balzarotti Date: Mon, 12 Aug 2019 15:12:08 +0000 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello, Sorry, I just realized fields were exported as a single-element lists. Fixed now, please ignore the previous patch. Nicolò From 88d1951d62b59a7458150a466d77b790f13343ea Mon Sep 17 00:00:00 2001 From: nixo Date: Mon, 12 Aug 2019 16:42:08 +0200 Subject: [PATCH] website: export JSON package list to packages.json --- website/apps/packages/builder.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/website/apps/packages/builder.scm b/website/apps/packages/builder.scm index 59f86c1..58a6a64 100644 --- a/website/apps/packages/builder.scm +++ b/website/apps/packages/builder.scm @@ -1,6 +1,7 @@ ;;; GNU Guix web site ;;; Copyright © 2017 Ludovic Courtès ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2019 Nicolò Balzarotti ;;; ;;; Initially written by sirgazil ;;; who waives all copyright interest on this file. @@ -36,6 +37,8 @@ #:use-module (haunt page) #:use-module (haunt utils) #:use-module (srfi srfi-1) + #:use-module (guix) + #:use-module (json) #:export (builder)) @@ -76,6 +79,7 @@ ;; used instead. They should generate pages as those described ;; in the proposal. (list + (package-json-builder) (detailed-index-builder) (detailed-package-list-builder))))) @@ -101,6 +105,17 @@ (length (all-packages)))))) (make-page "packages/index.html" (index-t context) sxml->html))) +(define (package-json-builder) + "Return a JSON listing all packages." + (define (package-fields package) + `(("name" . ,(package-name package)) + ("version" . ,(package-version package)) + ("synopsis" . ,(package-synopsis package)) + ("homepage" . ,(package-home-page package)))) + (define (packages->json packages) + (map package-fields packages)) + (make-page "packages.json" + (packages->json (all-packages)) scm->json)) (define (detailed-index-builder) "Return a Haunt page listing some random packages." -- 2.22.0