From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:48031)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ir8b1-0002Jj-UP
 for guix-patches@gnu.org; Mon, 13 Jan 2020 17:54:08 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ir8b0-0002eF-V4
 for guix-patches@gnu.org; Mon, 13 Jan 2020 17:54:07 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:54385)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1ir8b0-0002e5-S4
 for guix-patches@gnu.org; Mon, 13 Jan 2020 17:54:06 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ir8az-0004iI-SB
 for guix-patches@gnu.org; Mon, 13 Jan 2020 17:54:05 -0500
Subject: [bug#39120] [PATCH 11/12] gnu: ruby: Update to 2.6.5.
Resent-Message-ID: <handler.39120.B39120.157895602918020@debbugs.gnu.org>
From: Christopher Baines <mail@cbaines.net>
Date: Mon, 13 Jan 2020 22:53:35 +0000
Message-Id: <20200113225336.15160-11-mail@cbaines.net>
In-Reply-To: <20200113225336.15160-1-mail@cbaines.net>
References: <20200113225336.15160-1-mail@cbaines.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: 39120@debbugs.gnu.org

Make zlib a propagated-input, as the pkgconfig configuration includes linking
against zlib as default, which means that gems with native components will
fail to build without zlib.

* gnu/packages/ruby.scm (ruby): Update to 2.6.5.
---
 gnu/packages/ruby.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 2a7bec40bc..a4def037f2 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -77,7 +77,7 @@
 (define-public ruby
   (package
     (name "ruby")
-    (version "2.5.3")
+    (version "2.6.5")
     (source
      (origin
        (method url-fetch)
@@ -86,7 +86,7 @@
                            "/ruby-" version ".tar.xz"))
        (sha256
         (base32
-         "0vrhrw7kcz9mg0jkqnihkcxqy5k05v8k1j0y2735z8wfk8sx1j8w"))
+         "0qhsw2mr04f3lqinkh557msr35pb5rdaqy4vdxcj91flgxqxmmnm"))
        (modules '((guix build utils)))
        (snippet `(begin
                    ;; Remove bundled libffi
@@ -116,8 +116,9 @@
      `(("readline" ,readline)
        ("openssl" ,openssl)
        ("libffi" ,libffi)
-       ("gdbm" ,gdbm)
-       ("zlib" ,zlib)))
+       ("gdbm" ,gdbm)))
+    (propagated-inputs
+     `(("zlib" ,zlib)))
     (native-search-paths
      (list (search-path-specification
             (variable "GEM_PATH")
-- 
2.24.1