From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:57102) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3dGy-00032V-5x for guix-patches@gnu.org; Mon, 17 Feb 2020 05:05:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j3dGw-0001u7-M5 for guix-patches@gnu.org; Mon, 17 Feb 2020 05:05:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60267) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j3dGw-0001tu-Iv for guix-patches@gnu.org; Mon, 17 Feb 2020 05:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j3dGw-0003Up-ET for guix-patches@gnu.org; Mon, 17 Feb 2020 05:05:02 -0500 Subject: [bug#38408] [PATCH v9 3/8] Added Guile-Semver as a dependency to guix Resent-Message-ID: Date: Mon, 17 Feb 2020 12:03:45 +0200 From: Efraim Flashner Message-ID: <20200217100345.GI1968@E5400> References: <8a86631d201313b1da427a5ceb2ca5f201e6546c.1580817140.git.mjbecze@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="XjbSsFHOHxvQpKib" Content-Disposition: inline In-Reply-To: <8a86631d201313b1da427a5ceb2ca5f201e6546c.1580817140.git.mjbecze@riseup.net> 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: Martin Becze Cc: 38408@debbugs.gnu.org, ludo@gnu.org, jsoo1@asu.edu --XjbSsFHOHxvQpKib Content-Type: multipart/mixed; boundary="IJFRpmOek+ZRSQoz" Content-Disposition: inline --IJFRpmOek+ZRSQoz Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The tree has moved a bit since you sent the patch, here's a copy I made that applies --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --IJFRpmOek+ZRSQoz Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0003-Added-Guile-Semver-as-a-dependency-to-guix.patch" Content-Transfer-Encoding: quoted-printable =46rom 578d6f023c706df999c1b1b1bb23c9771b279857 Mon Sep 17 00:00:00 2001 =46rom: Martin Becze Date: Tue, 4 Feb 2020 07:18:20 -0500 Subject: [PATCH 3/8] Added Guile-Semver as a dependency to guix * configure.ac: added check for guile-semver * gnu/packages/package-management.scm (guix): added guile-semver as dep Signed-off-by: Efraim Flashner --- configure.ac | 6 ++++++ doc/guix.texi | 2 ++ gnu/packages/package-management.scm | 7 +++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 06e86c209f..0896c23955 100644 --- a/configure.ac +++ b/configure.ac @@ -118,6 +118,12 @@ if test "x$have_guile_git" !=3D "xyes"; then AC_MSG_ERROR([Guile-Git is missing; please install it.]) fi =20 +dnl Check for Guile-Semver +GUILE_MODULE_AVAILABLE([have_guile_semver], [(semver)]) +if test "x$have_guile_semver" !=3D "xyes"; then + AC_MSG_ERROR([Guile-Semver is missing; please install it.]) +fi + dnl Check for Guile-JSON. GUIX_CHECK_GUILE_JSON if test "x$guix_cv_have_recent_guile_json" !=3D "xyes"; then diff --git a/doc/guix.texi b/doc/guix.texi index aa50340fe2..bc6a431b4c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -74,6 +74,7 @@ Copyright @copyright{} 2019, 2020 Simon Tournier@* Copyright @copyright{} 2020 Wiktor =C5=BBelazny@* Copyright @copyright{} 2020 Damien Cassou@* Copyright @copyright{} 2020 Jakub K=C4=85dzio=C5=82ka@* +Copyright @copyright{} 2020 Martin Becze@* =20 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -764,6 +765,7 @@ or later; @uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August 2017 or later; @item @uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON} = 3.x; +@item @uref{https://ngyro.com/software/guile-semver.html, Guile-Semver} 0.= 1.x; @item @url{https://zlib.net, zlib}; @item @url{https://www.gnu.org/software/make/, GNU Make}. @end itemize diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index 09888ca9e2..2419f49184 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -11,6 +11,7 @@ ;;; Copyright =C2=A9 2018, 2019 Eric Bavier ;;; Copyright =C2=A9 2019, 2020 Efraim Flashner ;;; Copyright =C2=A9 2019 Jonathan Brielmaier +;;; Copyright =C2=A9 2020 Martin Becze ;;; ;;; This file is part of GNU Guix. ;;; @@ -248,8 +249,9 @@ (ssh (assoc-ref inputs "guile-ssh")) (gnutls (assoc-ref inputs "gnutls")) (locales (assoc-ref inputs "glibc-utf8-loca= les")) + (semver (assoc-ref inputs "guile-semver")) (deps (list gcrypt json sqlite gnutls - git bs ssh)) + git bs ssh semver)) (effective (read-line (open-pipe* OPEN_READ @@ -322,7 +324,8 @@ ("guile-json" ,guile-json-3) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) - ("guile-git" ,guile-git))) + ("guile-git" ,guile-git) + ("guile-semver",guile-semver))) =20 (home-page "https://www.gnu.org/software/guix/") (synopsis "Functional package manager for installed software package= s and versions") --=20 2.25.0 --IJFRpmOek+ZRSQoz-- --XjbSsFHOHxvQpKib Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl5KZQEACgkQQarn3Mo9 g1GYqxAAq5/Hi0t3NY4UC9tDFcZVz45JQ/ChWtuWdrd5WZUeNpwil2wPJ9LrBa3y PiigraurhVw8OBk/LBtK/ydyDU7seLQ2WVCZWgCLAFunVdJoqnNNklZWJ4HGFMZ8 69MmNYmrocV8yeJcHNGMp+adSsQMutpTlxqTHMcHOILHDYASMb/tQ0n+4AB1LEdi Go870H7fFezz6OFPaA1b7DaYx+yZ1+SEKJbAjyxw7Qp3LLn76yS8Cjth5eC/2BGr l1JKDTnxtwLJjIi6zy65JqPGJ94JFhc+mASPi9UJywTVv43Xur6H/JDA/eXjG1oi tVgpJX4nXJBXZx7V6Aan1AkACsZb8gT+o+psuhPe2D7aKBJEeYz5eX51r9F1UeiF RRjWMjm1Ha9wgtbd0N+zKRLqopKabJWHU4Lo+ceejLV7me+JZllyAqJCANSBlbYF WvqPn9p73YtJhUhIk8Egi9QDsMVKb4jyYqm+WNDhQHDTDEwzs+skoD6k0ATpMhxl k3kRIw3PJ+L40MRYRwiA8zQUjy9VOETIxhOUX/tdqZBzeJoqJZSNqr6Q85BV1tS5 0n+TFeGNZb7IIu+TwhjfXXkW4DHkyVIGQprrTJlSoP5egyKZBocGXfWpDyGSz76s YbdPiZZqevmJt75NQ8GwaXzmGqrwQjOaYJilnfWdEErJHR0KlwE= =7c6s -----END PGP SIGNATURE----- --XjbSsFHOHxvQpKib--