From debbugs-submit-bounces@debbugs.gnu.org Thu May 04 06:05:03 2017 Received: (at submit) by debbugs.gnu.org; 4 May 2017 10:05:03 +0000 Received: from localhost ([127.0.0.1]:53565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6Dd8-0007xj-AV for submit@debbugs.gnu.org; Thu, 04 May 2017 06:05:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6Dd6-0007xN-6V for submit@debbugs.gnu.org; Thu, 04 May 2017 06:05:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6Dd0-0006ZR-Et for submit@debbugs.gnu.org; Thu, 04 May 2017 06:04:55 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:53137) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6Dd0-0006ZL-Bn for submit@debbugs.gnu.org; Thu, 04 May 2017 06:04:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6Dcz-0000dh-DE for guix-patches@gnu.org; Thu, 04 May 2017 06:04:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6Dcv-0006XD-CB for guix-patches@gnu.org; Thu, 04 May 2017 06:04:53 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:35083) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d6Dcv-0006WF-6B for guix-patches@gnu.org; Thu, 04 May 2017 06:04:49 -0400 Received: by mail-wm0-x241.google.com with SMTP id d79so2216280wmi.2 for ; Thu, 04 May 2017 03:04:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=jgGmGx06CCXFSo3xEVRJL2hGT5gGwfN0bz6u+j3RZEo=; b=fPH/wi4oij32tQnXd+ZXB38kScFeiBxZn3Tq++vr3oSCUWuBKfbX6R5Sv0A59dsMo7 rn2g+51ujtIhfXrmeszFAWJrf1XcjBb3ervDYe70w6k9ZKIDGr9qowzj9T5opbwujz2/ N/QXg7YoYldP8Pszptp+S+e5noTbWTUfWySuvUxQPaCkySHHG/CXivZSpVlyqxzymFWx Vh6PCiUc0huzchexsX8xibvarPctq3TZQB43vhcMk0yIjC2IHAv6saIiJAS1+cUHu4pm vdVhm6OFycnQOcQoDJ86QWNG/bbJ9nlDq5DEwJe0tujfnUMFF+o0hk56ovGl2BaU5PPt niSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jgGmGx06CCXFSo3xEVRJL2hGT5gGwfN0bz6u+j3RZEo=; b=GYiqITZH9QR/+UgF8vt6wmUxp/BTYbSuB7B4+a3BJTLAQKoljPOAHLCh0MhlckrADe RfL+HtXbJ8dwEaWjviRnCIWhgjJCdacUvRnN/xL3R6Uk1Hc4H+Lu9gGSXBICALJrLaRL hXrvKJFANzExN9xEAON6HEFDTHlB3FiTPQGkBSwWbcaWi3TGbmcQ0CnaMA88PlFrw+qL ZMrmgA9cmaFomHZO43LV1Crb9Rfy7vxx57tjPUjErOE3ymbK/rKqVIviF5uZFa+dI2PW qzxYZB0nRTH1Wb2Kt06wX8EdWQ3j/KDzWcY7IRVDXv53hA/9UuYE41MqpLVEnNyAQ++d Czhg== X-Gm-Message-State: AODbwcDNBBqmxS9AZ+0r0kNOx1bhqflwM4+x5UhtX0b99m0LjQJR3zPM a5lkGdMgBGZyVA== X-Received: by 10.28.158.82 with SMTP id h79mr1231873wme.3.1493892286701; Thu, 04 May 2017 03:04:46 -0700 (PDT) Received: from cervin.8.8.8.8 (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id w136sm833226wmd.0.2017.05.04.03.04.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 May 2017 03:04:45 -0700 (PDT) From: Mathieu Othacehe To: guix-patches@gnu.org Subject: [PATCH 0/3] Fix guix refresh errors. Date: Thu, 4 May 2017 12:04:41 +0200 Message-Id: <20170504100441.27271-1-m.othacehe@gmail.com> X-Mailer: git-send-email 2.12.2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) Hi Guix, This serie fixes problems I ran into when running guix refresh. Thanks, Mathieu Mathieu Othacehe (3): gnu: python-termcolor: Fix uri. import: cran: Robustify cran-package?. import: pypi: Robustify latest-release. gnu/packages/python.scm | 2 +- gnu/packages/statistics.scm | 1 + guix/import/cran.scm | 7 ++++++- guix/import/pypi.scm | 21 ++++++++++++--------- 4 files changed, 20 insertions(+), 11 deletions(-) -- 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Thu May 04 06:06:38 2017 Received: (at 26772) by debbugs.gnu.org; 4 May 2017 10:06:38 +0000 Received: from localhost ([127.0.0.1]:53570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6Deg-00080k-Ge for submit@debbugs.gnu.org; Thu, 04 May 2017 06:06:38 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:34909) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6Def-00080W-Jl for 26772@debbugs.gnu.org; Thu, 04 May 2017 06:06:37 -0400 Received: by mail-wm0-f47.google.com with SMTP id w64so13342382wma.0 for <26772@debbugs.gnu.org>; Thu, 04 May 2017 03:06:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+OMyRtttYTDvPB8/5XLQBi67el2l9YSdYz80fxDoPjk=; b=cYgIcCPTvfCZ7AIv/dtAXPx1gGCb5ABF+sdbsR+iErwcjwOVmdAbYdS620uqy/Es67 ITILJ3Jjzj+Y7peZ/V8aoIrIQP+8LvC6gYFfqGQIv+UfAULXWy02NFp7i8tuLTo9hJ4g NdEto93vY6J3iHzFAk88KibzapJ82IPSkf9RLEWZ7w2jreRCdMMe13IF3ooOmuK6rJnX vupHmuC8NgGK1lHz+s3smsyZ6BlkqHzbgUo+Ootm8LijX1M5OW8trHR6vMj1eYfwds+3 V8hlxIhppKinJH9wft8ri17nAcwFSV6eyFQ12Mw59j/RFjO3AbV6IW3xJaxsE78gMV9v JjHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+OMyRtttYTDvPB8/5XLQBi67el2l9YSdYz80fxDoPjk=; b=SzBm37JLQ18lb8paOBuQ2alMdGaaoZjp8TbRDKmpTbhiaTWDN7Qi051OR0GnyBPWYr Z9JUFenNyFJzomWr9HC2UJqPuIG6x1ISUADIsDHdBducBVLDs+LnxPG8b+VWqiKcIxM6 wBydZPTFYV1XLdXvaczSXovRMFE9OYP5GsM9OL9zsOvqVtGdxd3P+mZhb1YucL8Ef741 MVvGCifa6jIu1hIng0EeuIlQZoHwU2X+ncGNqjDhTAz3Hn5BYtgFcooWhQwAj0pbWtSw C4NG0VzMdaocI9EClvKra/Fl5CbYf2zJUU1pdplaml3kkvh1gLOMrlDYTV4x43veymUS w3IA== X-Gm-Message-State: AN3rC/4Fy1ZTEHYQu1KPgOR7+ZivVh9fwLqXa41oCbicYgG54uRH6bxw Pgm57u0OzTwBSQ== X-Received: by 10.28.125.69 with SMTP id y66mr1116332wmc.77.1493892392056; Thu, 04 May 2017 03:06:32 -0700 (PDT) Received: from cervin.8.8.8.8 (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id v7sm790317wrv.59.2017.05.04.03.06.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 May 2017 03:06:31 -0700 (PDT) From: Mathieu Othacehe To: 26772@debbugs.gnu.org Subject: [PATCH 1/3] gnu: python-termcolor: Fix uri. Date: Thu, 4 May 2017 12:06:25 +0200 Message-Id: <20170504100627.27553-1-m.othacehe@gmail.com> X-Mailer: git-send-email 2.12.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 26772 Cc: Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) * gnu/packages/python.scm (python-termcolor): Remove "python-" from pypi uri. This was causing guix refresh to fail on this package. --- gnu/packages/python.scm | 2 +- gnu/packages/statistics.scm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4c7aee20c..f88828ac1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7489,7 +7489,7 @@ a hash value.") (source (origin (method url-fetch) - (uri (pypi-uri "python-termcolor" version)) + (uri (pypi-uri "termcolor" version)) (sha256 (base32 "0fv1vq14rpqwgazxg4981904lfyp84mnammw7y046491cv76jv8x")))) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index b81bb4207..9c646e15f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016, 2017 Raoul Bonnal +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; -- 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Thu May 04 06:06:43 2017 Received: (at 26772) by debbugs.gnu.org; 4 May 2017 10:06:43 +0000 Received: from localhost ([127.0.0.1]:53574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6Dek-000815-Oz for submit@debbugs.gnu.org; Thu, 04 May 2017 06:06:42 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:37954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6Dej-00080a-3q for 26772@debbugs.gnu.org; Thu, 04 May 2017 06:06:41 -0400 Received: by mail-wm0-f42.google.com with SMTP id 142so5646539wma.1 for <26772@debbugs.gnu.org>; Thu, 04 May 2017 03:06:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jOmZ4xSC5qIKOwsXNnDtBlEcjNGET6h1H4UJnl7mQy0=; b=CnFv01/R/ghOCXqBdqgtkfZdB63YIrwcfjPbnYBqDgo8meifBMYgWX194SHcGaUacE PpGg+tG5e5fgfYP9ZUZLEdBLxauqnPSJKMOU1BjzyK1KwzY0X+nS6ubsh/G6pKPPzoqj YVrvFw0vZxwe73D91Tm2WAAPMDZAs1zicvpu6umM9yjP2OmtiyyIKUISqAsxRIAYUvuV 2GgOJsNKZQonsF/a668LmnRfMt6rYMpFNDeNJRGPB26sen7oy0pQMQHhRrDKLbl1vzt8 JC0Ss8MNNBSZrAr1x00Cv1v36Y+OF5w4iDo5u8GhTfvUvbMaH8H3YdedIE+UCDNRuBKQ wO7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jOmZ4xSC5qIKOwsXNnDtBlEcjNGET6h1H4UJnl7mQy0=; b=tUWH+YoI7aT7Cd63cLxZMIo/tBUWyEyZmvMP8g7SuiOs+mhRzIEUM2oumZY351LY8q a9I100Q0bCtCiWd7E5RCnj7QweVa2MdEksjI09uCz7DohV7Y1A44akX/HI6foEhis/gX upGo6AkVxR088Qe1a67PGzPRdAfPnClqDQwTxpx0LRAjhvIvXc/BR0yIBPLrKMmF6aNv XNyFxCcffg0kgqrzabq9mSZDzEqMTYJ2M/qgTBHLVJFgsyRK2xM0+9JBi8CfWFA2VGeS yC9ics/uLTjzdnhOkbd+vVsJxs0EZUhUL9LH6WmAq8vMTRno3m6AKCMeBgyn/PKtzOz4 +fIA== X-Gm-Message-State: AN3rC/4uQCm3Z99ZJ42JvxNw+rmA2zhIrBggxWF41BpMI/+KTcKUpVCl Poa3ZewTMq6kdHqv X-Received: by 10.28.0.200 with SMTP id 191mr1247726wma.12.1493892395216; Thu, 04 May 2017 03:06:35 -0700 (PDT) Received: from cervin.8.8.8.8 (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id v7sm790317wrv.59.2017.05.04.03.06.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 May 2017 03:06:34 -0700 (PDT) From: Mathieu Othacehe To: 26772@debbugs.gnu.org Subject: [PATCH 2/3] import: cran: Robustify cran-package?. Date: Thu, 4 May 2017 12:06:26 +0200 Message-Id: <20170504100627.27553-2-m.othacehe@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170504100627.27553-1-m.othacehe@gmail.com> References: <20170504100627.27553-1-m.othacehe@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 26772 Cc: Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) * guix/import/cran.scm (package->upstream-name): Return #f if url start and end index could not be determined. (cran-package?): Check if the upstream-name can be extracted from given package. This fixes a failure of guix refresh on r-minimal because no upsteam-name can be determined from ".../R-version.tar.gz" uri. --- guix/import/cran.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index be34a75c8..20009e2af 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -374,7 +375,8 @@ dependencies." (start (string-rindex url #\/))) ;; The URL ends on ;; (string-append "/" name "_" version ".tar.gz") - (substring url (+ start 1) end))) + (if (and start end) + (substring url (+ start 1) end) #f))) (_ #f))) (_ #f))))) @@ -415,6 +417,9 @@ dependencies." (define (cran-package? package) "Return true if PACKAGE is an R package from CRAN." (and (string-prefix? "r-" (package-name package)) + ;; Check if the upstream name can be extracted from package uri. + (package->upstream-name package) + ;; Check if package uri(s) are prefixed by "mirror://cran". (match (and=> (package-source package) origin-uri) ((? string? uri) (string-prefix? "mirror://cran" uri)) -- 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Thu May 04 06:06:44 2017 Received: (at 26772) by debbugs.gnu.org; 4 May 2017 10:06:44 +0000 Received: from localhost ([127.0.0.1]:53576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6Dem-00081E-0g for submit@debbugs.gnu.org; Thu, 04 May 2017 06:06:44 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35659) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6Dej-00080c-WE for 26772@debbugs.gnu.org; Thu, 04 May 2017 06:06:42 -0400 Received: by mail-wm0-f66.google.com with SMTP id d79so2226386wmi.2 for <26772@debbugs.gnu.org>; Thu, 04 May 2017 03:06:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yaHeu9P6d3KZSlgqwUNLlgc/Dpc4girX9+8RqhRe7Ak=; b=iQzXUlGKsWxKjg0D0mCOFXBcYqa+aoUhHPliULSze5kTj+AtuysvmfUe9PEh3qjUjs MZdUmw195E4aQxAlY3bmy8uf1gJCIR9NTdzMW7vgKm6g5zRWZqE9SyGMYuf68Zm+QOvU T2GfPnESsnIQeJyua2cAtoPqlzVsUuAPEYqO8U+XK4TfNQFPNIKMZNUEaCZyb58PBLen nW6OIYLAnOqaP4MvMOTaMhiLh/Smu6MUDnayJyubUWhI5A6Nm2TbZKGXCwwmcJ8ZiAF+ l1+/aIHi+RXVoLHBxxwaypEC/mYoywB+xkOlGnJAOgehk251dMg0mxvoa5vdyTdUSI6n XTtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yaHeu9P6d3KZSlgqwUNLlgc/Dpc4girX9+8RqhRe7Ak=; b=Gftzop30e6xTGGSvTSLqbXEGNAiokI86xH+fjVqkI8WBuFErfuxbYOC+bAvdBO8bYm wztURZRjgAIAKlaStarwlVN8TevjoEbHyXCKYMWiWE9QcyJURuirfJRmkNnVLWMPRIE6 crQNkfi33w3KcNCBc5JQQvYWhr0QAhENGPX4n1vCfPRIeRGSjrEP8RQgw/6+wYxXIVbX c9xu3KBTMQ5xFJILEkuAERhZ/ASIabDfM/hFdMhpol7OIcrcjkqmK9Q7qz/zK9VL4+U+ lv2K/Kt9cPmHtrzhlX5569YW29a5UlMHBhQz4MPcE0f1dOqrwL1e9n0+fDEzgQlvjpDr AHQA== X-Gm-Message-State: AN3rC/6oiDW6JnJaJXJ1i0wcx+Ndmi+5pymkkZ2VKxaeMcaxwGKvZslE 8WLS65KB/VuzuQ== X-Received: by 10.28.59.69 with SMTP id i66mr1179714wma.22.1493892396412; Thu, 04 May 2017 03:06:36 -0700 (PDT) Received: from cervin.8.8.8.8 (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id v7sm790317wrv.59.2017.05.04.03.06.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 May 2017 03:06:35 -0700 (PDT) From: Mathieu Othacehe To: 26772@debbugs.gnu.org Subject: [PATCH 3/3] import: pypi: Robustify latest-release. Date: Thu, 4 May 2017 12:06:27 +0200 Message-Id: <20170504100627.27553-3-m.othacehe@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170504100627.27553-1-m.othacehe@gmail.com> References: <20170504100627.27553-1-m.othacehe@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 26772 Cc: Mathieu Othacehe X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) * guix/import/pypi.scm (latest-release): Check if pypi-fetch has failed. If so return #f, else construct the . --- guix/import/pypi.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 4f9518f2e..9c72e7331 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 David Thompson ;;; Copyright © 2015 Cyril Roelandt ;;; Copyright © 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -322,15 +323,17 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." (define (latest-release package) "Return an for the latest release of PACKAGE." - (guard (c ((missing-source-error? c) #f)) - (let* ((pypi-name (guix-package->pypi-name package)) - (metadata (pypi-fetch pypi-name)) - (version (assoc-ref* metadata "info" "version")) - (url (assoc-ref (latest-source-release metadata) "url"))) - (upstream-source - (package (package-name package)) - (version version) - (urls (list url)))))) + (let* ((pypi-name (guix-package->pypi-name package)) + (pypi-package (pypi-fetch pypi-name))) + (and pypi-package + (guard (c ((missing-source-error? c) #f)) + (let* ((metadata pypi-package) + (version (assoc-ref* metadata "info" "version")) + (url (assoc-ref (latest-source-release metadata) "url"))) + (upstream-source + (package (package-name package)) + (version version) + (urls (list url)))))))) (define %pypi-updater (upstream-updater -- 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Thu May 04 06:09:01 2017 Received: (at 26772) by debbugs.gnu.org; 4 May 2017 10:09:01 +0000 Received: from localhost ([127.0.0.1]:53582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6Dgz-00084z-Db for submit@debbugs.gnu.org; Thu, 04 May 2017 06:09:01 -0400 Received: from mail-wr0-f179.google.com ([209.85.128.179]:36246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6Dgx-00084k-UT for 26772@debbugs.gnu.org; Thu, 04 May 2017 06:09:00 -0400 Received: by mail-wr0-f179.google.com with SMTP id l50so4982094wrc.3 for <26772@debbugs.gnu.org>; Thu, 04 May 2017 03:08:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version:content-transfer-encoding; bh=tqk8anjyFDoEfDkxw9jhNk3vxMbmZ6xknUMO7SS1RVc=; b=mjofQGBd6MNR3RmuthQ5S8m2LXKV7z2CmbAdZSqSVwZDPi2gwgPzXlqVQSmWAc/L8G 59zWx2k8pLfQRu0QitJgLuOkwXtXGOrJDDReHFyaknGDx2xj2L7P/0YDVkaDIJKwACdg CmkUgmIbtSOgv/4ro/b0QDOJRNbN4zI0j232KMUcu37xjW3DGhRZoxRc0p4PRaS1dknD HIS+1yCF7jc9cJG5y3cNua1rVfutbdHF9bsxnxEhN/BdX89A0YSNUr7AxRq4WAA+fIlN 3xDGBb8wQ8EAokSbrsQdX80gb8WI1AtoCVyXstIUIUg06Op9rIgHKccgzl/FI/vR3O+P 6eZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version:content-transfer-encoding; bh=tqk8anjyFDoEfDkxw9jhNk3vxMbmZ6xknUMO7SS1RVc=; b=am91hOAxv8GMiFqO2lRltk+8UP0Zjje5+zRKWEgtvYR4sONwTCW7p9/Skl3oVkssNo gGZzYPh/HVO0Qk2CtfUEmdNZsJedQEXqt08oFnjRvlY+woz4T6YMLpMea/lbMDWZTbGZ qC0Ut1AXS4oM+K7919qrZP07S/jvVi2oL3na3esVILa81VJBnrjnSnfpjAMEEF9nt748 yT1DSQFUIyJUXKGrRNb0AWEkr7lrzTnI9EeeeMVVKbsvO9nZRpZkRCIG1/ogtZO6NWUZ lE6ongqBYZZfr1kiSoNf+5Aao7VgvZRpNYv5+W0IX7xCHaYnZkRdvSSzlnC7BFuhFA9C iH6A== X-Gm-Message-State: AN3rC/42UtWym2Dx56sPoW+oTkOMrjgwxNbMfkP3dJCRR6KWSR0fZBXk xrzqZEfHvQUN7A== X-Received: by 10.223.136.227 with SMTP id g32mr27810167wrg.58.1493892534344; Thu, 04 May 2017 03:08:54 -0700 (PDT) Received: from zbook ([46.218.109.88]) by smtp.gmail.com with ESMTPSA id 184sm905488wmr.30.2017.05.04.03.08.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 May 2017 03:08:53 -0700 (PDT) References: <20170504100627.27553-1-m.othacehe@gmail.com> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe To: Mathieu Othacehe Subject: Re: [PATCH 1/3] gnu: python-termcolor: Fix uri. In-reply-to: <20170504100627.27553-1-m.othacehe@gmail.com> Date: Thu, 04 May 2017 12:09:26 +0200 Message-ID: <864lx153xl.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.8 (--) X-Debbugs-Envelope-To: 26772 Cc: 26772@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) Oops, wrong file for copyright, I would fix it when commiting. > +++ b/gnu/packages/statistics.scm > @@ -7,6 +7,7 @@ > ;;; Copyright © 2016 Roel Janssen > ;;; Copyright © 2016 Ben Woodcroft > ;;; Copyright © 2016, 2017 Raoul Bonnal > +;;; Copyright © 2017 Mathieu Othacehe > ;;; > ;;; This file is part of GNU Guix. > ;;; From debbugs-submit-bounces@debbugs.gnu.org Fri May 12 18:08:05 2017 Received: (at 26772) by debbugs.gnu.org; 12 May 2017 22:08:05 +0000 Received: from localhost ([127.0.0.1]:41409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9IjE-0004t1-VH for submit@debbugs.gnu.org; Fri, 12 May 2017 18:08:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46243) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9IjD-0004sQ-Hi for 26772@debbugs.gnu.org; Fri, 12 May 2017 18:08:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9Ij5-0007a2-DK for 26772@debbugs.gnu.org; Fri, 12 May 2017 18:07:58 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35284) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9Ij5-0007Zu-BA; Fri, 12 May 2017 18:07:55 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:40356 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d9Ij4-0004M1-PP; Fri, 12 May 2017 18:07:55 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Mathieu Othacehe Subject: Re: bug#26772: [PATCH 1/3] gnu: python-termcolor: Fix uri. References: <20170504100441.27271-1-m.othacehe@gmail.com> <20170504100627.27553-1-m.othacehe@gmail.com> Date: Sat, 13 May 2017 00:07:52 +0200 In-Reply-To: <20170504100627.27553-1-m.othacehe@gmail.com> (Mathieu Othacehe's message of "Thu, 4 May 2017 12:06:25 +0200") Message-ID: <87fug9685j.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26772 Cc: 26772@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Mathieu Othacehe skribis: > * gnu/packages/python.scm (python-termcolor): Remove "python-" from > pypi uri. > > This was causing guix refresh to fail on this package. OK! From debbugs-submit-bounces@debbugs.gnu.org Fri May 12 18:11:19 2017 Received: (at 26772) by debbugs.gnu.org; 12 May 2017 22:11:19 +0000 Received: from localhost ([127.0.0.1]:41414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9ImN-0004xb-EV for submit@debbugs.gnu.org; Fri, 12 May 2017 18:11:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9ImJ-0004xK-T1 for 26772@debbugs.gnu.org; Fri, 12 May 2017 18:11:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9ImB-0001Yz-PL for 26772@debbugs.gnu.org; Fri, 12 May 2017 18:11:10 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35474) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9ImB-0001Yr-LM; Fri, 12 May 2017 18:11:07 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:40358 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d9ImB-0004Vp-17; Fri, 12 May 2017 18:11:07 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Mathieu Othacehe Subject: Re: bug#26772: [PATCH 2/3] import: cran: Robustify cran-package?. References: <20170504100627.27553-1-m.othacehe@gmail.com> <20170504100627.27553-2-m.othacehe@gmail.com> Date: Sat, 13 May 2017 00:11:04 +0200 In-Reply-To: <20170504100627.27553-2-m.othacehe@gmail.com> (Mathieu Othacehe's message of "Thu, 4 May 2017 12:06:26 +0200") Message-ID: <87bmqx6807.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26772 Cc: 26772@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Mathieu Othacehe skribis: > * guix/import/cran.scm (package->upstream-name): Return #f if url > start and end index could not be determined. > (cran-package?): Check if the upstream-name can be extracted from > given package. [...] > @@ -374,7 +375,8 @@ dependencies." > (start (string-rindex url #\/))) > ;; The URL ends on > ;; (string-append "/" name "_" version ".tar.gz") > - (substring url (+ start 1) end))) > + (if (and start end) > + (substring url (+ start 1) end) #f))) This can be written as: (and start end (substring url =E2=80=A6)) > @@ -415,6 +417,9 @@ dependencies." > (define (cran-package? package) > "Return true if PACKAGE is an R package from CRAN." > (and (string-prefix? "r-" (package-name package)) > + ;; Check if the upstream name can be extracted from package uri. > + (package->upstream-name package) > + ;; Check if package uri(s) are prefixed by "mirror://cran". > (match (and=3D> (package-source package) origin-uri) > ((? string? uri) > (string-prefix? "mirror://cran" uri)) OK! Do you think you could add this specific case (r-minimal) as a test case for =E2=80=98cran-package?=E2=80=99 in tests/cran.scm? That would be aweso= me. Otherwise LGTM, thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri May 12 18:12:01 2017 Received: (at 26772) by debbugs.gnu.org; 12 May 2017 22:12:01 +0000 Received: from localhost ([127.0.0.1]:41417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9In2-0004yX-UU for submit@debbugs.gnu.org; Fri, 12 May 2017 18:12:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47827) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9In1-0004yI-1j for 26772@debbugs.gnu.org; Fri, 12 May 2017 18:11:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9Ims-00024b-Te for 26772@debbugs.gnu.org; Fri, 12 May 2017 18:11:53 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35483) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9Ims-00024J-Px; Fri, 12 May 2017 18:11:50 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:40360 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d9Ims-0004YB-1V; Fri, 12 May 2017 18:11:50 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Mathieu Othacehe Subject: Re: bug#26772: [PATCH 3/3] import: pypi: Robustify latest-release. References: <20170504100627.27553-1-m.othacehe@gmail.com> <20170504100627.27553-3-m.othacehe@gmail.com> Date: Sat, 13 May 2017 00:11:47 +0200 In-Reply-To: <20170504100627.27553-3-m.othacehe@gmail.com> (Mathieu Othacehe's message of "Thu, 4 May 2017 12:06:27 +0200") Message-ID: <877f1l67z0.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26772 Cc: 26772@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Mathieu Othacehe skribis: > * guix/import/pypi.scm (latest-release): Check if pypi-fetch has > failed. If so return #f, else construct the . OK! Thanks for fixing all these things! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 06:45:07 2017 Received: (at 26772-done) by debbugs.gnu.org; 13 May 2017 10:45:07 +0000 Received: from localhost ([127.0.0.1]:41822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9UXr-0000q2-5e for submit@debbugs.gnu.org; Sat, 13 May 2017 06:45:07 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:38421) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9UXo-0000pG-V8 for 26772-done@debbugs.gnu.org; Sat, 13 May 2017 06:45:05 -0400 Received: by mail-wm0-f41.google.com with SMTP id v15so3996625wmv.1 for <26772-done@debbugs.gnu.org>; Sat, 13 May 2017 03:45:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version:content-transfer-encoding; bh=mAQ8aAr0GzTvB3+jOyhbPxn5XsOKEosD9X/0JJ6/Gxg=; b=Zlf5H8a8jhyQ4OiORYpJ/RjOvHxAz/OXl3WSyx3QA4pX5kcU1QDMacihtiK2XkqKZB 4oqe05PGt3NH2qL+LeJbv8hr5ej0SQsviqfCMN+hDbAj/SbwCc6NjH5w17hkYIbW2BO8 iB9UvaHTwD0FT9w8eWV8WKi9AcWnIRopSicvDARTmCULb+++qXinNqQAm00pmW4cevbr 6B1TdGCx9VHW8mpwISF1e2J1b2seRSjJNCadz9j6va5OC298TaRS1O5c6ConiBRSIpcH H75pkjAMZ07stCwm5S2z9ouu0gsMvpwaTJnht8tYoXTUibHlLjXGQUPZbSPBv722NMys Jv5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version:content-transfer-encoding; bh=mAQ8aAr0GzTvB3+jOyhbPxn5XsOKEosD9X/0JJ6/Gxg=; b=uQBzepxloWhtV067ad3PFzZnbEDGmdtuL3KrR9A+mj2UTPGc3uhhu+By1WjocBQevB dTgR5HeZuLmRPhqaFk3xXxTVMRpeqcBxF/UVowAT+VvejbEyKNPl1fFqIAnqZ4xQz5IK irYLQwc52Cgu/SUWJuXeE3JMdgCNyXlacN7wt+aAPQExRYADEEWI0huO0ZfGTioRkNzF 9WNNp8Ldacy2WFHc8emN9VkFZGdPykYWXBef9CPEEiuXSrvwIV5CFcIgvrPwZwoulWHD E3MfxRKkcBJQ8gPd4nRdvP3HMA/4KTqlpBwvU0sMBYqg1fWvKPo/UrOIH/Ia1XW2S5Ll xl9w== X-Gm-Message-State: AODbwcAxVZror/LlY9eRRURNcIan4aC7wbpPszuUWHVIdiZZ1S+sC7tq 8L23SMuiAnt15Q== X-Received: by 10.28.142.70 with SMTP id q67mr969015wmd.99.1494672299191; Sat, 13 May 2017 03:44:59 -0700 (PDT) Received: from cervin (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id 2sm5170978wmk.20.2017.05.13.03.44.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 13 May 2017 03:44:58 -0700 (PDT) References: <20170504100627.27553-1-m.othacehe@gmail.com> <20170504100627.27553-2-m.othacehe@gmail.com> <87bmqx6807.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#26772: [PATCH 2/3] import: cran: Robustify cran-package?. In-reply-to: <87bmqx6807.fsf@gnu.org> Date: Sat, 13 May 2017 12:44:57 +0200 Message-ID: <87fug9828m.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 26772-done Cc: 26772-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) Hi Ludo ! Thanks for the review. > This can be written as: > > (and start end (substring url …)) Done. > >> @@ -415,6 +417,9 @@ dependencies." >> (define (cran-package? package) >> "Return true if PACKAGE is an R package from CRAN." >> (and (string-prefix? "r-" (package-name package)) >> + ;; Check if the upstream name can be extracted from package uri. >> + (package->upstream-name package) >> + ;; Check if package uri(s) are prefixed by "mirror://cran". >> (match (and=> (package-source package) origin-uri) >> ((? string? uri) >> (string-prefix? "mirror://cran" uri)) > > OK! > > Do you think you could add this specific case (r-minimal) as a test case > for ‘cran-package?’ in tests/cran.scm? That would be awesome. > > Otherwise LGTM, thanks! Sure I pushed this patch with the change above and a new test in tests/cran.scm : --8<---------------cut here---------------start------------->8--- (test-equal "r-mininal is not a cran package" #f ((@@ (guix import cran) cran-package?) r-minimal)) --8<---------------cut here---------------end--------------->8--- I also pushed the two other patches of the serie. Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 09:12:51 2017 Received: (at 26772-done) by debbugs.gnu.org; 13 May 2017 13:12:51 +0000 Received: from localhost ([127.0.0.1]:41888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9Wqo-00068J-Qm for submit@debbugs.gnu.org; Sat, 13 May 2017 09:12:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9Wqn-000686-Rh for 26772-done@debbugs.gnu.org; Sat, 13 May 2017 09:12:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9Wqf-0000ab-Lx for 26772-done@debbugs.gnu.org; Sat, 13 May 2017 09:12:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9Wqf-0000aV-Iu; Sat, 13 May 2017 09:12:41 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:40572 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d9Wqe-0005Bs-Pf; Sat, 13 May 2017 09:12:41 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Mathieu Othacehe Subject: Re: bug#26772: [PATCH 2/3] import: cran: Robustify cran-package?. References: <20170504100627.27553-1-m.othacehe@gmail.com> <20170504100627.27553-2-m.othacehe@gmail.com> <87bmqx6807.fsf@gnu.org> <87fug9828m.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 24 =?utf-8?Q?Flor=C3=A9al?= an 225 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Sat, 13 May 2017 15:12:38 +0200 In-Reply-To: <87fug9828m.fsf@gmail.com> (Mathieu Othacehe's message of "Sat, 13 May 2017 12:44:57 +0200") Message-ID: <877f1k529l.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26772-done Cc: 26772-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Mathieu Othacehe skribis: >> Do you think you could add this specific case (r-minimal) as a test case >> for =E2=80=98cran-package?=E2=80=99 in tests/cran.scm? That would be aw= esome. >> >> Otherwise LGTM, thanks! > > Sure I pushed this patch with the change above and a new test in > tests/cran.scm : > > (test-equal "r-mininal is not a cran package" > #f > ((@@ (guix import cran) cran-package?) r-minimal)) > > I also pushed the two other patches of the serie. Perfect, thank you! Ludo=E2=80=99. From unknown Sat Sep 20 12:00:41 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 11 Jun 2017 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator