From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:56446) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5yRv-0003wU-TE for guix-patches@gnu.org; Sun, 23 Feb 2020 16:06:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5yRu-0001EU-F3 for guix-patches@gnu.org; Sun, 23 Feb 2020 16:06:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45691) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j5yRu-0001EN-B1 for guix-patches@gnu.org; Sun, 23 Feb 2020 16:06:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j5yRu-0000k3-5S for guix-patches@gnu.org; Sun, 23 Feb 2020 16:06:02 -0500 Subject: [bug#38408] [PATCH v9 3/8] Added Guile-Semver as a dependency to guix Resent-Message-ID: From: Martin Becze References: <8a86631d201313b1da427a5ceb2ca5f201e6546c.1580817140.git.mjbecze@riseup.net> <20200217100345.GI1968@E5400> <87wo8l702y.fsf@gnu.org> <874kvld2bl.fsf@gnu.org> <87sgj4nwjw.fsf@gnu.org> <8453e3ce-bc5a-3bb3-1bfb-deaca7ca11d3@riseup.net> Message-ID: Date: Sun, 23 Feb 2020 16:05:11 -0500 MIME-Version: 1.0 In-Reply-To: <8453e3ce-bc5a-3bb3-1bfb-deaca7ca11d3@riseup.net> Content-Type: multipart/mixed; boundary="------------9A5BE1BFE1FC943380BBD5D1" Content-Language: en-US List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 38408@debbugs.gnu.org, Efraim Flashner , jsoo1@asu.edu This is a multi-part message in MIME format. --------------9A5BE1BFE1FC943380BBD5D1 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Ok here is a correct version, I addded guile3.0-semver and used that in (guix self) instead of guile-semver. Let me know if this works! Cheers! On 2/21/20 11:25 AM, Martin Becze wrote: > > > On 2/21/20 4:01 AM, Ludovic Courtès wrote: >> Hi Martin, > >> Sounds good.  Could you please squash it with the commit that adds >> support for semver? > > Squashed and attached as > v10-0002-guix-import-crate-Use-semver-to-resovle-module-v.patch > >> Also, we may want to add guile-semver to ‘dependencies’ in >> ‘compiled-guix’ in (guix self).  That way, a pulled guix will have >> guile-semver available, and thus ‘guix import crate’ will work out of >> the box. > > I added that it is attached as > v10-0008-guix-self-added-guile-semver-as-a-depenedency.patch > But I'm not sure how to test guix pull to see if it correctly brought in > guile-semver! --------------9A5BE1BFE1FC943380BBD5D1 Content-Type: text/x-patch; charset=UTF-8; name="0003-guix-self-added-guile-semver-as-a-depenedency.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0003-guix-self-added-guile-semver-as-a-depenedency.patch" >From 7eed4dcafc4635d17e8bc7af520b6293187ef008 Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Fri, 21 Feb 2020 10:41:44 -0500 Subject: [PATCH 3/3] guix: self: added guile-semver as a depenedency * guix/self.scm (compliled-guix) added guile-semver as a depenedency --- guix/self.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guix/self.scm b/guix/self.scm index 6b633f9bc0..7da7fdea81 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2020 Martin Becze ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,6 +55,7 @@ ("guile-git" (ref '(gnu packages guile) 'guile3.0-git)) ("guile-sqlite3" (ref '(gnu packages guile) 'guile3.0-sqlite3)) ("guile-gcrypt" (ref '(gnu packages gnupg) 'guile3.0-gcrypt)) + ("guile-semver" (ref '(gnu packages guile-xyz) 'guile3.0-semver)) ("gnutls" (ref '(gnu packages tls) 'guile3.0-gnutls)) ("zlib" (ref '(gnu packages compression) 'zlib)) ("lzlib" (ref '(gnu packages compression) 'lzlib)) @@ -682,6 +684,9 @@ Info manual." (define guile-gcrypt (specification->package "guile-gcrypt")) + (define guile-semver + (specification->package "guile-semver")) + (define gnutls (specification->package "gnutls")) @@ -690,7 +695,7 @@ Info manual." (cons (list "x" package) (package-transitive-propagated-inputs package))) (list guile-gcrypt gnutls guile-git guile-json - guile-ssh guile-sqlite3)) + guile-ssh guile-sqlite3 guile-semver)) (((labels packages _ ...) ...) packages))) -- 2.25.1 --------------9A5BE1BFE1FC943380BBD5D1 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-Add-guile3.0-semver.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0002-gnu-Add-guile3.0-semver.patch" >From 07dccc523ff215a58558e5b1549784dc0495192f Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Sun, 23 Feb 2020 04:27:42 -0500 Subject: [PATCH 2/3] gnu: Add guile3.0-semver * gnu/packages/guile-xyz.scm --- gnu/packages/guile-xyz.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 8b8a1306de..45efa44e83 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2019 swedebugia ;;; Copyright © 2019 Amar Singh ;;; Copyright © 2019 Timothy Sample +;;; Copyright © 2019 Martin Becze ;;; ;;; This file is part of GNU Guix. ;;; @@ -2981,6 +2982,13 @@ comparing, and writing Semantic Versions. It also includes ranges in the style of the Node Package Manager (NPM).") (license license:gpl3+))) +(define-public guile3.0-semver + (package + (inherit guile-semver) + (name "guile3.0-semver") + (inputs + `(("guile" ,guile-3.0))))) + (define-public guile-hashing (package (name "guile-hashing") -- 2.25.1 --------------9A5BE1BFE1FC943380BBD5D1 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-guile-semver-updated-to-0.1.1.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-gnu-guile-semver-updated-to-0.1.1.patch" >From 5652089496642edb3fea8d09a061bc9fc7353c33 Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Sun, 23 Feb 2020 15:07:20 -0500 Subject: [PATCH 1/3] gnu: guile-semver: updated to 0.1.1 * gnu/packages/guile-xyx.scm --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 16b408900c..8b8a1306de 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2960,14 +2960,14 @@ tests being run, resulting clearer and more specific output.") (define-public guile-semver (package (name "guile-semver") - (version "0.1.0") + (version "0.1.1") (source (origin (method url-fetch) (uri (string-append "https://files.ngyro.com/guile-semver/" "guile-semver-" version ".tar.gz")) (sha256 (base32 - "06b66rj7nyhr6i3dpkwvfw1xb10w2pngrsw2hxfxkznwsbh9byfz")))) + "109p4n39ln44cxvwdccf9kgb96qx54makvd2ir521ssz6wchjyag")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- 2.25.1 --------------9A5BE1BFE1FC943380BBD5D1--