From 1db791d5f4d0730cc7acf30d79ccaba36b29c8bf Mon Sep 17 00:00:00 2001
From: Ben Woodcroft <donttrustben@gmail.com>
Date: Wed, 20 Jul 2016 20:31:40 +1000
Subject: gnu: ruby-rack: Update to 2.0.1.

* gnu/packages/ruby.scm (ruby-rack): Update to 2.0.1.
[source]: Use GitHub and patch.
[native-inputs]: Add ruby-concurrent, ruby-minitest, ruby-minitest-sprint,
which.  Remove ruby-bacon.
[propagated-inputs]: Add ruby-concurrent.
* gnu/packages/patches/ruby-rack-ignore-failing-test.patch: New file.
* gnu/local.mk: Add it.
---
 gnu/packages/ruby.scm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/ruby.scm')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index fbf8d982ca..36a7154d45 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -24,6 +24,7 @@
 (define-module (gnu packages ruby)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages readline)
@@ -2898,14 +2899,22 @@ (define-public ruby-nokogiri-diff
 (define-public ruby-rack
   (package
     (name "ruby-rack")
-    (version "1.6.4")
+    (version "2.0.1")
     (source
      (origin
        (method url-fetch)
-       (uri (rubygems-uri "rack" version))
+       ;; Download from GitHub so that the patch can be applied.
+       (uri (string-append
+             "https://github.com/rack/rack/archive/"
+             version
+             ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"))))
+         "00k62v8lpyjzghkn0h0awrnqj1jmlcs2wp57py27m43y65v89cp3"))
+       ;; Ignore test which fails inside the build environment but works
+       ;; outside.
+       (patches (search-patches "ruby-rack-ignore-failing-test.patch"))))
     (build-system ruby-build-system)
     (arguments
      '(#:phases
@@ -2930,7 +2939,11 @@ (define-public ruby-rack
                                  (number->string (+ 33 size-diff))))))
              #t)))))
     (native-inputs
-     `(("ruby-bacon" ,ruby-bacon)))
+     `(("ruby-minitest" ,ruby-minitest)
+       ("ruby-minitest-sprint" ,ruby-minitest-sprint)
+       ("which" ,which)))
+    (propagated-inputs
+     `(("ruby-concurrent" ,ruby-concurrent)))
     (synopsis "Unified web application interface for Ruby")
     (description "Rack provides a minimal, modular and adaptable interface for
 developing web applications in Ruby.  By wrapping HTTP requests and responses,
-- 
cgit v1.2.3