From patchwork Tue Apr 14 17:19:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 21249 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 3BE0D27BBE4; Tue, 14 Apr 2020 18:30:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,T_SPF_HELO_TEMPERROR autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 236F827BBE1 for ; Tue, 14 Apr 2020 18:30:08 +0100 (BST) Received: from localhost ([::1]:36264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOPNu-0001Cl-NR for patchwork@mira.cbaines.net; Tue, 14 Apr 2020 13:30:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48103) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOPFC-0005kW-Lo for guix-patches@gnu.org; Tue, 14 Apr 2020 13:21:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOPFA-0007MI-GY for guix-patches@gnu.org; Tue, 14 Apr 2020 13:21:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51403) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOPF9-0007L3-Cn for guix-patches@gnu.org; Tue, 14 Apr 2020 13:21:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jOPF9-0006bg-9W for guix-patches@gnu.org; Tue, 14 Apr 2020 13:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40629] [PATCH 4/5] scripts/build: options->things-to-build: Handle .json files. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Apr 2020 17:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40629 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40629@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 40629-submit@debbugs.gnu.org id=B40629.158688482325301 (code B ref 40629); Tue, 14 Apr 2020 17:21:03 +0000 Received: (at 40629) by debbugs.gnu.org; 14 Apr 2020 17:20:23 +0000 Received: from localhost ([127.0.0.1]:34712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jOPEU-0006Zw-PR for submit@debbugs.gnu.org; Tue, 14 Apr 2020 13:20:23 -0400 Received: from sender4-of-o53.zoho.com ([136.143.188.53]:21367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jOPET-0006Zn-5J for 40629@debbugs.gnu.org; Tue, 14 Apr 2020 13:20:21 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1586884818; cv=none; d=zohomail.com; s=zohoarc; b=UbOfGuj72AN4yENgWZYm6zxgKkSUGNmNzWupXKKum6DiIi6NTfeXJo/d21mglhRWDTEtUbsBJvuKTQjQnwi7l0sC/X4yWvPRN3rka/+5v+++Yb9wEqAQoSfQNo37yGpwLD+8sdiDuuPlxUaEEYmqBd1mwb4sAkWq94nGgx3HZwA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586884818; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=FoIpDRQjgyhJFei7QFOnUse0FGrtxi3w77KOsQTXkHA=; b=aEA/5HbFulzgO+rEs9uqrWZVlOQurOktNPXh9gVLj3mnW3nQI7tewXw46Xs4cj90KUZtyXM0duFnXw82RlydPv6VnKU669TutklDBTOpHuGdw+PyJO5huW+iND6g8HMfFUF5a+A4hWObBKGKaMrXujyEnRN28jT0izipkmga0Bg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1586884818; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Message-ID:Subject:Date:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=FoIpDRQjgyhJFei7QFOnUse0FGrtxi3w77KOsQTXkHA=; b=Nb9svazwdfPtR/niXYjwmeBT3WktJHrqsBsilqo0xUrEzFO5MlYzmkOjKnIfmcMs N7iJrDIswdoPsgocsoPpjoqyalblRZls+bij+BC+8pAzESlzvdGLahiWJjU3tliwmb7 fUw4s8nY9k7wW9TUfEynZ3F4vSzz7wSmSMujk3cg= Received: from localhost (p54AD4D5F.dip0.t-ipconnect.de [84.173.77.95]) by mx.zohomail.com with SMTPS id 1586884815879691.574894298318; Tue, 14 Apr 2020 10:20:15 -0700 (PDT) From: Ricardo Wurmus Message-ID: <20200414171959.3428-4-rekado@elephly.net> Date: Tue, 14 Apr 2020 19:19:58 +0200 X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200414171959.3428-1-rekado@elephly.net> References: <20200414171959.3428-1-rekado@elephly.net> MIME-Version: 1.0 X-ZohoMailClient: External 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 * guix/scripts/build.scm (options->things-to-build): Handle files that end on .json. --- guix/scripts/build.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 79bd84a1a0..8ff2fd1910 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013 Mark H Weaver ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ (define-module (guix scripts build) #:use-module (guix ui) #:use-module (guix scripts) + #:use-module (guix import json) #:use-module (guix store) #:use-module (guix derivations) #:use-module (guix packages) @@ -834,7 +836,10 @@ build---packages, gexps, derivations, and so on." (else (list (specification->package spec))))) (('file . file) - (ensure-list (load* file (make-user-module '())))) + (let ((file (or (and (string-suffix? ".json" file) + (json->scheme-file file)) + file))) + (ensure-list (load* file (make-user-module '()))))) (('manifest . manifest) (map manifest-entry-item (manifest-entries