From patchwork Tue Apr 14 17:19:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 21250 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 84AC027BBE4; Tue, 14 Apr 2020 18:30:25 +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,URIBL_BLOCKED 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 5BB3727BBE1 for ; Tue, 14 Apr 2020 18:30:25 +0100 (BST) Received: from localhost ([::1]:36280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOPOC-0001Y0-QY for patchwork@mira.cbaines.net; Tue, 14 Apr 2020 13:30:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48086) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOPFC-0005j6-1O for guix-patches@gnu.org; Tue, 14 Apr 2020 13:21:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOPF9-0007LD-DL for guix-patches@gnu.org; Tue, 14 Apr 2020 13:21:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51402) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOPF9-0007L0-8H for guix-patches@gnu.org; Tue, 14 Apr 2020 13:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jOPF8-0006bL-4z for guix-patches@gnu.org; Tue, 14 Apr 2020 13:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40629] [PATCH 1/5] import/print: Return license with prefix. References: <87y2qym5v8.fsf@elephly.net> In-Reply-To: <87y2qym5v8.fsf@elephly.net> Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Apr 2020 17:21:02 +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.158688481225249 (code B ref 40629); Tue, 14 Apr 2020 17:21:02 +0000 Received: (at 40629) by debbugs.gnu.org; 14 Apr 2020 17:20:12 +0000 Received: from localhost ([127.0.0.1]:34703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jOPEK-0006ZB-0U for submit@debbugs.gnu.org; Tue, 14 Apr 2020 13:20:12 -0400 Received: from sender4-of-o53.zoho.com ([136.143.188.53]:21361) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jOPEI-0006Yu-3j for 40629@debbugs.gnu.org; Tue, 14 Apr 2020 13:20:10 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1586884806; cv=none; d=zohomail.com; s=zohoarc; b=gl0/NzvBSYIV9fJYJ6ChzA9EgoPZezpBN/xvLPMVdqdnTqZszJEr/0vCl0zBrWcUrWCs4aqzLu+s2KMYfK/1U/6PSa1pK+QCH7mkBQByZHzqZa0ppzon8gL4wCN0j4cMRCtRmjJcHCWuv8PJQJ60kLWP3JwO9awCnE90dq0/xT0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586884806; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=QTS4QwdOObT1ABRKlGYcrOBk/o0BS0s8bMPRQD1GY+I=; b=ZLkaF/tITuYQ4JYmBR4BVx73FepwQvAluvFWmlPWl/kxP3uEFOEM9Wi8uEZp6UmyErQRdbVOe+7Mo5sj4TNE6QzfMIQefkiFpMMIuyWThAxv+/CvIrUwVGs6vhn4e5Yvct6Wm7E83kuarQ5CPA7+j2kvyD9I1UyadoryPEOGBMk= 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=1586884806; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Message-ID:Subject:Date:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=QTS4QwdOObT1ABRKlGYcrOBk/o0BS0s8bMPRQD1GY+I=; b=A1ksKYg1fQVIi+qq0rhGTdexG0qa0c7X1tlTDGTllpIwiiVv8yFHgi+yicf5ARM3 Rlu/7Qi5ZGbSVuoIdGmdVS9P7H+u6mxCIyvCExR3fc/Lrf86DhBQy3m8M0qFdKx+TvU LtGWGj1F/O1moGW1miX4y4/s/bBj5pDUzNSuUwBo= Received: from localhost (p54AD4D5F.dip0.t-ipconnect.de [84.173.77.95]) by mx.zohomail.com with SMTPS id 1586884804887512.8893174671015; Tue, 14 Apr 2020 10:20:04 -0700 (PDT) From: Ricardo Wurmus Message-ID: <20200414171959.3428-1-rekado@elephly.net> Date: Tue, 14 Apr 2020 19:19:55 +0200 X-Mailer: git-send-email 2.25.1 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/import/print.scm (license->code): Prepend license: prefix. --- guix/import/print.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/import/print.scm b/guix/import/print.scm index 4c2a91fa4f..b819e7cf90 100644 --- a/guix/import/print.scm +++ b/guix/import/print.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,7 +57,7 @@ when evaluated." ;; Print either license variable name or the code for a license object (define (license->code lic) (let ((var (variable-name lic '(guix licenses)))) - (or var + (or (symbol-append 'license: var) `(license (name ,(license-name lic)) (uri ,(license-uri lic))