diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 12:51:57 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 13:11:40 -0400 |
| commit | 5e2140511c1ad9ccd731438b74d61b62111da1e6 (patch) | |
| tree | a4ff748ad26e121b88469b5d921001ef1382be8f /gnu/packages/ruby.scm | |
| parent | 9e3a5ee417ea7fe9721be8804ff047e80c4f22ed (diff) | |
| parent | 353bdae32f72b720c7ddd706576ccc40e2b43f95 (diff) | |
| download | guix-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar guix-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar.gz | |
Merge branch 'staging'
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/gdb.scm
gnu/packages/llvm.scm
gnu/packages/package-management.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/ruby.scm')
| -rw-r--r-- | gnu/packages/ruby.scm | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 81269d28d9..42d4faa234 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -650,8 +650,8 @@ outcomes of a code example.") (synopsis "Ripper-style abstract syntax tree to Ruby source generator") (description "Sorcerer generates Ruby code from a Ripper-like abstract syntax tree (i.e. S-Expressions). Sorcerer is targeted mainly at small -snippets of Ruby code, expressable in a single line. Longer examples may be -re-sourced, but they will be rendered in a single line format.") +snippets of Ruby code, expressible in a single line. Longer examples may be +re-sourced, but they will be rendered in a single-line format.") (home-page "https://github.com/rspec-given/sorcerer") (license license:expat))) @@ -3753,8 +3753,7 @@ specs for Ruby implementations in ruby/spec.") (invoke "rspec")) #t))))) (inputs - `(("mariadb" ,mariadb "lib") - ("mariadb-dev" ,mariadb "dev") + `(("mariadb-dev" ,mariadb "dev") ("zlib" ,zlib))) (native-inputs `(("ruby-rspec" ,ruby-rspec) @@ -7750,7 +7749,7 @@ master/html-formatter/ruby") (native-inputs `(;; Use a untested version of aruba, to avoid a circular dependency, as ;; ruby-aruba depends on ruby-cucumber. - ("ruby-aruba", ruby-aruba-without-tests) + ("ruby-aruba" ,ruby-aruba-without-tests) ("ruby-rspec" ,ruby-rspec) ("ruby-pry" ,ruby-pry) ("ruby-nokogiri" ,ruby-nokogiri) @@ -8809,7 +8808,7 @@ display width of strings in Ruby.") (native-inputs `(("ruby-rdoc" ,ruby-rdoc) ("ruby-rspec" ,ruby-rspec) - ("ruby-rubygems-tasks", ruby-rubygems-tasks))) + ("ruby-rubygems-tasks" ,ruby-rubygems-tasks))) (synopsis "Ruby library to help check the Ruby version") (description "@code{ruby_version} provides a @code{RubyVersion} module to simplify checking for the right Ruby version in software.") @@ -9921,7 +9920,7 @@ all known public suffixes.") ("bundler" ,bundler) ("ruby-idn-ruby" ,ruby-idn-ruby) ("ruby-sporkmonger-rack-mount" ,ruby-sporkmonger-rack-mount) - ("ruby-rspec-its", ruby-rspec-its-minimal) + ("ruby-rspec-its" ,ruby-rspec-its-minimal) ("ruby-yard" ,ruby-yard) ("ruby-simplecov" ,ruby-simplecov))) (propagated-inputs |