From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Woodcroft Subject: [PATCHES] Add ruby-mini-portile-2, upgrade ruby-nokogiri Date: Tue, 22 Dec 2015 22:29:49 +1000 Message-ID: <5679423D.9020305@uq.edu.au> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060805020606030205000208" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBM4p-0003h9-Jd for guix-devel@gnu.org; Tue, 22 Dec 2015 07:30:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBM4m-0006ls-Bf for guix-devel@gnu.org; Tue, 22 Dec 2015 07:30:03 -0500 Received: from mailhub2.soe.uq.edu.au ([130.102.132.209]:38900 helo=newmailhub.uq.edu.au) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBM4l-0006h8-OQ for guix-devel@gnu.org; Tue, 22 Dec 2015 07:30:00 -0500 Received: from smtp2.soe.uq.edu.au (smtp2.soe.uq.edu.au [10.138.113.41]) by newmailhub.uq.edu.au (8.14.5/8.14.5) with ESMTP id tBMCTqx2029495 for ; Tue, 22 Dec 2015 22:29:52 +1000 Received: from [192.168.1.105] (static.customers.nuskope.com.au [103.25.181.216] (may be forged)) (authenticated bits=0) by smtp2.soe.uq.edu.au (8.14.5/8.14.5) with ESMTP id tBMCToSh054350 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT) for ; Tue, 22 Dec 2015 22:29:51 +1000 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: "guix-devel@gnu.org" This is a multi-part message in MIME format. --------------060805020606030205000208 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Nokogiri now requires an updated version of mini_portile (the gem was renamed to mini_portile2), but given that new versions of the 0.6.x branch still seem to be released I think keeping a separate mini_portile package is the go. TIA. --------------060805020606030205000208 Content-Type: text/x-patch; name="0001-gnu-Add-ruby-mini-portile-2.patch" Content-Disposition: attachment; filename="0001-gnu-Add-ruby-mini-portile-2.patch" Content-Transfer-Encoding: 7bit >From 1239963682ba7ff049fb9be8a56926ca23d32b64 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Tue, 22 Dec 2015 21:51:43 +1000 Subject: [PATCH 1/2] gnu: Add ruby-mini-portile-2. * gnu/packages/ruby.scm (ruby-mini-portile-2): New variable. --- gnu/packages/ruby.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a3eafb1..24e6359 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1683,6 +1683,16 @@ to reproduce user environments.") (home-page "http://github.com/flavorjones/mini_portile") (license license:expat))) +(define-public ruby-mini-portile-2 + (package (inherit ruby-mini-portile) + (version "2.0.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "mini_portile2" version)) + (sha256 + (base32 + "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l")))))) + (define-public ruby-nokogiri (package (name "ruby-nokogiri") -- 2.5.0 --------------060805020606030205000208 Content-Type: text/x-patch; name="0002-gnu-ruby-nokogiri-Upgrade-to-1.6.7.1.patch" Content-Disposition: attachment; filename="0002-gnu-ruby-nokogiri-Upgrade-to-1.6.7.1.patch" Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by newmailhub.uq.edu.au id tBMCTqx2029495 >From e860cf565c377004d820e812d9fd7763861b0510 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Tue, 22 Dec 2015 21:48:01 +1000 Subject: [PATCH 2/2] gnu: ruby-nokogiri: Upgrade to 1.6.7.1. * gnu/packages/ruby.scm (ruby-nokogiri): Upgrade to 1.6.7.1. --- gnu/packages/ruby.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 24e6359..c8c3d16 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1696,13 +1696,13 @@ to reproduce user environments.") (define-public ruby-nokogiri (package (name "ruby-nokogiri") - (version "1.6.6.2") + (version "1.6.7.1") (source (origin (method url-fetch) (uri (rubygems-uri "nokogiri" version)) (sha256 (base32 - "1j4qv32qjh67dcrc1yy1h8sqjnny8siyy4s44awla8d6jk361h30"))= )) + "12nwv3lad5k2k73aa1d1xy4x577c143ixks6rs70yp78sinbglk2"))= )) (build-system ruby-build-system) (arguments ;; Tests fail because Nokogiri can only test with an installed exte= nsion, @@ -1720,7 +1720,7 @@ to reproduce user environments.") ("libxml2" ,libxml2) ("libxslt" ,libxslt))) (propagated-inputs - `(("ruby-mini-portile" ,ruby-mini-portile))) + `(("ruby-mini-portile" ,ruby-mini-portile-2))) (synopsis "HTML, XML, SAX, and Reader parser for Ruby") (description "Nokogiri (=E9=8B=B8) parses and searches XML/HTML, and= features both CSS3 selector and XPath 1.0 support.") --=20 2.5.0 --------------060805020606030205000208--