From patchwork Sat Nov 12 17:20:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Sassmannshausen X-Patchwork-Id: 17423 Received: (qmail 16034 invoked by uid 89); 12 Nov 2016 17:20:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.7 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=H*Ad:D*co X-Spam-Status: No, score=-4.7 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 12 Nov 2016 17:20:44 +0000 Received: from localhost ([::1]:59066 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c5byt-0000nP-9t for patchwork@sourceware.org; Sat, 12 Nov 2016 12:20:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c5bym-0000mX-3j for guix-devel@gnu.org; Sat, 12 Nov 2016 12:20:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c5byj-0007Cd-PZ for guix-devel@gnu.org; Sat, 12 Nov 2016 12:20:36 -0500 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:35966) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c5byj-0007CE-F8 for guix-devel@gnu.org; Sat, 12 Nov 2016 12:20:33 -0500 Received: by mail-wm0-x243.google.com with SMTP id m203so4208651wma.3 for ; Sat, 12 Nov 2016 09:20:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=p0tXr4vRIr9ju3C+ulpmlK+2I9S7OiJbbFRFiPYMkDQ=; b=mE63Ea3l8rpcqOOfneZRBAdJQyXJMfDOzXDrI74SxU2Rss9NznG9BLw0bliznJbQsh /SRpphCp/m7LXLfH1XjhRiL9WAkjL+zDg7OabAQ98p+mMrl9mqIXPVvTKdqJUyBWiKuv BGi1wRa3HxZ/4jkNS1aVLiGa4DbtPAFJ/Zfn6rljkQATjjdRpRI3Ho3zEVOQ8DVPTCnn GUpM+VulwwMeCT3ETE46VuEcbGHNrkpJYW6OmvofrcQCeVVSQEv8p1/1/kbiyLBrZXz+ Q6CmUYS7l3teBcPpylq2+DbFNS0hB+jHr6cUMom6OCFnVdKK6i+tbppGFAOb3Fmu/ppa JQ0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=p0tXr4vRIr9ju3C+ulpmlK+2I9S7OiJbbFRFiPYMkDQ=; b=bmEP8DTs2LHuAauYBXwS3134w9229Tw92Ie+zTyy6S5CAAnjIB98R+rsHfmqb0pg5K TAye2Rf1GTMTnl8IZyevblFFSkuQCsDTumHdlRNd9ha+ZKoTOhryM0eKb5qz04XSiNcY B7NhJvk8t38g2RdvMZ3xnTIAnqKWPEG4BIkLTpC20OZ9uFFlUmvVksDnVaLhWqriKLXG 8oMvmX0u940jhyjsEnQd5Tu1H12FKyjDMXz4P7GX6NKtQxi4TthQK2OOImaJmKqU6PsC C/6Dq+slnmFck+sfvbanpuxd5DVpYSbeYkuh8ue1MdCbf2vAPffUliPbfnxsZCMN4H0E htJA== X-Gm-Message-State: ABUngvfP5wMbcETR0qtA6NzBm+ltIRGn89ldpDqvmyAIYMCzbtmDDCLjRDKxwIYUaqM6QA== X-Received: by 10.28.69.91 with SMTP id s88mr3197763wma.18.1478971231069; Sat, 12 Nov 2016 09:20:31 -0800 (PST) Received: from localhost.localdomain ([91.178.67.142]) by smtp.gmail.com with ESMTPSA id u17sm17790068wma.24.2016.11.12.09.20.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Nov 2016 09:20:30 -0800 (PST) From: Alex Sassmannshausen X-Google-Original-From: Alex Sassmannshausen To: guix-devel@gnu.org Subject: [PATCH] import/cpan: Maybe coerce version to string. Date: Sat, 12 Nov 2016 18:20:05 +0100 Message-Id: <20161112172005.4445-2-alex@pompo.co> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161112172005.4445-1-alex@pompo.co> References: <20161112172005.4445-1-alex@pompo.co> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Sassmannshausen Errors-To: guix-devel-bounces+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" * guix/import/cpan.scm (cpan-module->sexp) : Test if version in meta is string or number. If it is number, coerce to string. --- guix/import/cpan.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index 5b7c475..d244969 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -128,7 +128,9 @@ META." (string-append "perl-" (string-downcase name)))) (define version - (assoc-ref meta "version")) + (match (assoc-ref meta "version") + ((? number? vrs) (number->string vrs)) + ((? string? vrs) vrs))) (define core-module? (let ((perl-version (package-version perl))