From 0b060e3486afdefdf5a5f474518b2a6bfae405d9 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 29 Sep 2018 11:15:36 +0100 Subject: gnu: ruby-shindo: Remove -rubygems flags. These have been removed in Ruby 2.5. * gnu/packages/ruby.scm (ruby-shindo)[arguments]: Change fix-tests phase to also remove the -rubygems flags. --- gnu/packages/ruby.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3673bf2346..b216f3f48b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1211,12 +1211,15 @@ standard output stream.") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "Rakefile" - (("system \"shindo") "system \"./bin/shindo") - ;; This test doesn't work, so we disable it. - (("fail \"The build_error test should fail") "#")) - #t))))) + (lambda _ + (substitute* "tests/tests_helper.rb" + (("-rubygems") "")) + (substitute* "Rakefile" + (("system \"shindo") "system \"./bin/shindo") + ;; This test doesn't work, so we disable it. + (("fail \"The build_error test should fail") "#") + ((" -rubygems") "")) + #t))))) (propagated-inputs `(("ruby-formatador" ,ruby-formatador))) (synopsis "Simple depth first Ruby testing") -- cgit v1.2.3 From 39ecb977d3e097ffe9c46390090bd197581ac072 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 29 Sep 2018 11:17:02 +0100 Subject: gnu: ruby-term-ansicolor: Fix test for Ruby 2.5. * gnu/packages/ruby.scm (ruby-term-ansicolor)[arguments]: Add new fix-test phase to fix a test that fails under Ruby 2.5. --- gnu/packages/ruby.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b216f3f48b..c039df1559 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2914,6 +2914,11 @@ Ruby's large and slower test/unit.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-test + (lambda - + (substitute* "tests/hsl_triple_test.rb" + (("0\\\\\\.0%") + "0\\.?0?%")))) (replace 'build (lambda _ (invoke "gem" "build" "term-ansicolor.gemspec")))))) -- cgit v1.2.3 From 2c7cb711e938ff9e358ffb274ea2f96ae84fc1e9 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 29 Sep 2018 11:18:54 +0100 Subject: gnu: ruby-sass-spec: Fix spec expectation. This fixes building ruby-sass with Ruby 2.5. * gnu/packages/ruby.scm (ruby-sass-spec)[arguments]: Add patch-test phase to fix the expectation of one of the tests. Also change the comment regarding the tests not being run. --- gnu/packages/ruby.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c039df1559..a0fe0c2e98 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5456,8 +5456,16 @@ strings or files.") ("ruby-diffy" ,ruby-diffy) ("ruby-terminfo" ,ruby-terminfo))) (arguments - ;; No Rakefile - `(#:tests? #f)) + `(;; This package contains tests for a sass implementation, and the to + ;; avoid any circular dependencies, the tests are not run here + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-test + (lambda _ + (delete-file "spec/values/colors/alpha_hex-3.5/error") + (substitute* "spec/values/colors/alpha_hex-3.5/expected_output.css" + (("string") "color"))))))) (home-page "https://github.com/sass/sass-spec") (synopsis "Test suite for Sass") (description "Sass Spec is a test suite for Sass. Test cases are all in -- cgit v1.2.3 From 4d372cb9a27b57664112b76e6a209b713abd1d10 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 29 Sep 2018 11:28:28 +0100 Subject: gnu: Add ruby-mathn. * gnu/packages/ruby.scm (ruby-mathn): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a0fe0c2e98..e54b1a0f69 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5108,6 +5108,29 @@ are doing, you can fiddle with every last bit of your email directly.") (home-page "https://github.com/mikel/mail") (license license:expat))) +(define-public ruby-mathn + (package + (name "ruby-mathn") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "mathn" version)) + (sha256 + (base32 + "1wn812llln9jzgybz2d7536q39z3gi99i6fi0j1dapcpzvhgrr0p")))) + (build-system ruby-build-system) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rake-compiler" ,ruby-rake-compiler))) + (synopsis "Extends math operations for increased precision") + (description + "This gem makes mathematical operations more precise in Ruby and +integrates other mathematical standard libraries. Prior to Ruby 2.5, +@code{mathn} was part of the Ruby standard library.") + (home-page "https://github.com/ruby/mathn") + (license license:bsd-2))) + (define-public ruby-code-statistics (package (name "ruby-code-statistics") -- cgit v1.2.3 From 11ff2adc74f3c168cadb6cc5bf7f4be08442b9ea Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 29 Sep 2018 11:29:30 +0100 Subject: gnu: ruby-sass: Update to 3.6.0. * gnu/packages/ruby.scm (ruby-sass)[version]: Update to 3.6.0. [source]: Update sha256. [native-inputs]: Add ruby-mathn, as this is needed when using Ruby 2.5. --- gnu/packages/ruby.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e54b1a0f69..2080944cae 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5498,18 +5498,19 @@ the @file{spec} directory.") (define-public ruby-sass (package (name "ruby-sass") - (version "3.5.7") + (version "3.6.0") (source (origin (method url-fetch) (uri (rubygems-uri "sass" version)) (sha256 (base32 - "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61")))) + "18c6prbw9wl8bqhb2435pd9s0lzarl3g7xf8pmyla28zblvwxmyh")))) (build-system ruby-build-system) (propagated-inputs `(("ruby-sass-listen" ,ruby-sass-listen))) (native-inputs - `(("ruby-sass-spec" ,ruby-sass-spec))) + `(("ruby-sass-spec" ,ruby-sass-spec) + ("ruby-mathn" ,ruby-mathn))) (home-page "http://sass-lang.com/") (synopsis "CSS extension language") (description "Sass is a CSS extension language. It extends CSS with -- cgit v1.2.3