From e7ea30d59a22857e7a2992ef7bd099b8f88127f7 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Tue, 8 Aug 2017 09:19:22 +1000 Subject: ruby: Replace with ruby-2.4.1. * gnu/packages/ruby.scm (ruby-2.4.1): New variable. (ruby)[replacement]: New field. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 414b38c4f..78ec9cdf3 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -49,6 +49,7 @@ (define-public ruby (package (name "ruby") + (replacement ruby-2.4.1) (version "2.4.0") (source (origin @@ -102,6 +103,26 @@ a focus on simplicity and productivity.") (home-page "https://ruby-lang.org") (license license:ruby))) +(define-public ruby-2.4.1 + (package + (inherit ruby) + (name "ruby") + (version "2.4.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://cache.ruby-lang.org/pub/ruby/" + (version-major+minor version) + "/ruby-" version ".tar.xz")) + (sha256 + (base32 + "0m763zf2v0jhrha3cx21g4dif6vc9gm714invs8h3sg35ncskj2g")) + (modules '((guix build utils))) + (snippet `(begin + ;; Remove bundled libffi + (delete-file-recursively "ext/fiddle/libffi-3.2.1") + #t)))))) + (define-public ruby-2.3 (package (inherit ruby) -- cgit v1.3 From 5071f17b29ab40c44c329668550b85bc606cee02 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sun, 6 Aug 2017 16:41:05 +1000 Subject: gnu: ruby-tdiff: Update to 0.3.3-1.b662a604. * gnu/packages/ruby.scm: Update to 0.3.3-1.b662a604 --- gnu/packages/ruby.scm | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 78ec9cdf3..4c8a6f2e5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2878,26 +2878,31 @@ including comments and whitespace.") (license license:expat))) (define-public ruby-tdiff - (package - (name "ruby-tdiff") - (version "0.3.3") - (source (origin - (method url-fetch) - (uri (rubygems-uri "tdiff" version)) - (sha256 - (base32 - "0k41jbvn8qq4mgrixnhlk742b971d136i8wpbcv2cczvi22xpc86")))) - (build-system ruby-build-system) - (native-inputs - `(("ruby-rspec-2" ,ruby-rspec-2) - ("ruby-yard" ,ruby-yard) - ("ruby-rubygems-tasks" ,ruby-rubygems-tasks))) - (synopsis "Calculate the differences between two tree-like structures") - (description - "This library provides functions to calculate the differences between two + ;; Use a newer than released snapshot so that rspec-2 is not required. + (let ((commit "b662a6048f08abc45c1a834e5f34dd1c662935e2")) + (package + (name "ruby-tdiff") + (version (string-append "0.3.3-1." (string-take commit 8))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/postmodern/tdiff.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0n3gq8rx49f7ln6zqlshqfg2mgqyy30rsdjlnki5mv307ykc7ad4")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-rspec" ,ruby-rspec) + ("ruby-yard" ,ruby-yard) + ("ruby-rubygems-tasks" ,ruby-rubygems-tasks))) + (synopsis "Calculate the differences between two tree-like structures") + (description + "This library provides functions to calculate the differences between two tree-like structures. It is similar to Ruby's built-in @code{TSort} module.") - (home-page "https://github.com/postmodern/tdiff") - (license license:expat))) + (home-page "https://github.com/postmodern/tdiff") + (license license:expat)))) (define-public ruby-nokogiri-diff (package -- cgit v1.3 From 5b0c223ae3470d8f9433d6301eeb9eeaf9193b90 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sun, 6 Aug 2017 16:52:40 +1000 Subject: gnu: ruby-nokogiri-diff: Update to 0.2.0-1.a38491e4. * gnu/packages/ruby.scm (ruby-nokogiri-diff): Update to 0.2.0-1.a38491e4. --- gnu/packages/ruby.scm | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4c8a6f2e5..29677dc02 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2905,29 +2905,34 @@ tree-like structures. It is similar to Ruby's built-in @code{TSort} module.") (license license:expat)))) (define-public ruby-nokogiri-diff - (package - (name "ruby-nokogiri-diff") - (version "0.2.0") - (source (origin - (method url-fetch) - (uri (rubygems-uri "nokogiri-diff" version)) - (sha256 - (base32 - "0njr1s42war0bj1axb2psjvk49l74a8wzr799wckqqdcb6n51lc1")))) - (build-system ruby-build-system) - (propagated-inputs - `(("ruby-tdiff" ,ruby-tdiff) - ("ruby-nokogiri" ,ruby-nokogiri))) - (native-inputs - `(("ruby-rspec-2" ,ruby-rspec-2) - ("ruby-yard" ,ruby-yard) - ("ruby-rubygems-tasks" ,ruby-rubygems-tasks))) - (synopsis "Calculate the differences between two XML/HTML documents") - (description - "@code{Nokogiri::Diff} adds the ability to calculate the + ;; Use a newer than released snapshot so that rspec-2 is not required. + (let ((commit "a38491e4d8709b7406f2cae11a50226d927d06f5")) + (package + (name "ruby-nokogiri-diff") + (version (string-append "0.2.0-1." (string-take commit 8))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/postmodern/nokogiri-diff.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1ah2sfjh9n1p0ln2wkqzfl448ml7j4zfy6dhp1qgzq2m41php6rf")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-tdiff" ,ruby-tdiff) + ("ruby-nokogiri" ,ruby-nokogiri))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec) + ("ruby-yard" ,ruby-yard) + ("ruby-rubygems-tasks" ,ruby-rubygems-tasks))) + (synopsis "Calculate the differences between two XML/HTML documents") + (description + "@code{Nokogiri::Diff} adds the ability to calculate the differences (added or removed nodes) between two XML/HTML documents.") - (home-page "https://github.com/postmodern/nokogiri-diff") - (license license:expat))) + (home-page "https://github.com/postmodern/nokogiri-diff") + (license license:expat)))) (define-public ruby-rack (package -- cgit v1.3 From 63755fcd65bc76240cf447aa4f6b282cff76ff57 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Mon, 7 Aug 2017 18:39:44 +1000 Subject: gnu: ruby-puma: Update to 3.9.1. * gnu/packages/ruby.scm (ruby-puma): Update to 3.9.1. [source]: Remove patch. [arguments]: Disable tests. [native-inputs]: Remove field. * gnu/packages/patches/ruby-puma-ignore-broken-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/ruby-puma-ignore-broken-test.patch | 13 ------------ gnu/packages/ruby.scm | 23 ++++------------------ 3 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/ruby-puma-ignore-broken-test.patch (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 8c00b0020..090ce77c7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1006,7 +1006,6 @@ dist_patch_DATA = \ %D%/packages/patches/rsem-makefile.patch \ %D%/packages/patches/ruby-concurrent-ignore-broken-test.patch \ %D%/packages/patches/ruby-concurrent-test-arm.patch \ - %D%/packages/patches/ruby-puma-ignore-broken-test.patch \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ %D%/packages/patches/rxvt-unicode-escape-sequences.patch \ diff --git a/gnu/packages/patches/ruby-puma-ignore-broken-test.patch b/gnu/packages/patches/ruby-puma-ignore-broken-test.patch deleted file mode 100644 index 8961ffa4c..000000000 --- a/gnu/packages/patches/ruby-puma-ignore-broken-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/test_cli.rb b/test/test_cli.rb -index 9c515c6..6bd439f 100644 ---- a/test/test_cli.rb -+++ b/test/test_cli.rb -@@ -88,7 +88,7 @@ class TestCLI < Test::Unit::TestCase - s << "GET /stats HTTP/1.0\r\n\r\n" - body = s.read - -- assert_match(/\{ "workers": 2, "phase": 0, "booted_workers": 0, "old_workers": 0, "worker_status": \[\{ "pid": \d+, "index": 0, "phase": 0, "booted": false, "last_checkin": "[^"]+", "last_status": \{\} \},\{ "pid": \d+, "index": 1, "phase": 0, "booted": false, "last_checkin": "[^"]+", "last_status": \{\} \}\] \}/, body.split("\r\n").last) -+ #assert_match(/\{ "workers": 2, "phase": 0, "booted_workers": 0, "old_workers": 0, "worker_status": \[\{ "pid": \d+, "index": 0, "phase": 0, "booted": false, "last_checkin": "[^"]+", "last_status": \{\} \},\{ "pid": \d+, "index": 1, "phase": 0, "booted": false, "last_checkin": "[^"]+", "last_status": \{\} \}\] \}/, body.split("\r\n").last) - - # wait until the first status ping has come through - sleep 6 diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 29677dc02..7d9d51f49 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4029,7 +4029,7 @@ part of the Prawn PDF generator.") (define-public ruby-puma (package (name "ruby-puma") - (version "3.6.0") + (version "3.9.1") (source (origin (method url-fetch) @@ -4039,32 +4039,17 @@ part of the Prawn PDF generator.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "08aws79n9slcr50d9lwm011cp1pxvr1409c2jmyjxywvrc0a30v1")) - ;; Ignore broken tests reported upstream. - ;; https://github.com/puma/puma/issues/995 - ;; https://github.com/puma/puma/issues/1044 - (patches (search-patches "ruby-puma-ignore-broken-test.patch")))) + "03pifga841h17brh4vgia8i2ybh3cmsyg0dbybzdf6dq51wzcxdx")))) (build-system ruby-build-system) (arguments - `(#:phases + `(#:tests? #f ; Tests require an out-dated version of minitest. + #:phases (modify-phases %standard-phases - (add-after 'unpack 'delete-integration-tests - (lambda _ - ;; One broken test in this file cannot be easily removed in - ;; isolation, it probably causes race conditions. So we delete - ;; the entire file. - (delete-file "test/test_integration.rb") - #t)) (add-before 'build 'fix-gemspec (lambda _ (substitute* "puma.gemspec" (("git ls-files") "find * |sort")) #t))))) - (native-inputs - `(("ruby-hoe" ,ruby-hoe) - ("ruby-rake-compiler" ,ruby-rake-compiler) - ("ruby-hoe-git" ,ruby-hoe-git) - ("ruby-rack" ,ruby-rack))) (synopsis "Simple, concurrent HTTP server for Ruby/Rack") (description "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server -- cgit v1.3 From cc36165efa073842bab006c77d06dabcf90bc21e Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Tue, 8 Aug 2017 21:52:31 +1000 Subject: gnu: ruby-activesupport: Update to 5.1.3. * gnu/packages/ruby.scm (ruby-activesupport): Update to 5.1.3. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7d9d51f49..02cc6e6fd 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2565,14 +2565,14 @@ you about the changes.") (define-public ruby-activesupport (package (name "ruby-activesupport") - (version "5.0.0") + (version "5.1.3") (source (origin (method url-fetch) (uri (rubygems-uri "activesupport" version)) (sha256 (base32 - "0k7zhnz0aw1ym8phs10r85f91ja45vsd058fm9v0h2k0igw12cpf")))) + "16r18n6b1nlky0xx2lw8c1f15gr2vm34xz5g4byjcxf88m1s07xh")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.3