amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into core-updates

Browse source
This commit is contained in:
Maxim Cournoyer 2020-09-14 16:17:19 -04:00
commit fa8fe90edb
No known key found for this signature in database
GPG key ID: 1260E46482E63562
282 changed files with 11822 additions and 44273 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/ruby.scm
View file

@ -7,7 +7,7 @@
;;; Copyright © 2015, 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017, 2018, 2019 Christopher Baines <mail@cbaines.net>
@ -1117,7 +1117,7 @@ line of code.")
#t))
(add-after 'unpack 'patch-pandoc-path
(lambda* (#:key inputs #:allow-other-keys)
(let ((pandoc (string-append (assoc-ref inputs "ghc-pandoc")
(let ((pandoc (string-append (assoc-ref inputs "pandoc")
"/bin/pandoc")))
(substitute* "lib/pandoc-ruby.rb"
(("@@pandoc_path = 'pandoc'")
@ -1137,7 +1137,7 @@ line of code.")
(native-inputs
`(("ruby-mocha" ,ruby-mocha)))
(inputs
`(("ghc-pandoc" ,ghc-pandoc)))
`(("pandoc" ,pandoc)))
(synopsis "Ruby wrapper for Pandoc")
(description "PandocRuby is a wrapper for Pandoc, a Haskell library with
command line tools for converting one markup format to another. Pandoc can
@ -6745,7 +6745,7 @@ inspired by the Sinatra microframework style of specifying actions:
(define-public ruby-rubocop-ast
(package
(name "ruby-rubocop-ast")
(version "0.1.0")
(version "0.3.0")
(source
(origin
(method git-fetch) ;no test suite in distributed gem
@ -6755,7 +6755,7 @@ inspired by the Sinatra microframework style of specifying actions:
(file-name (git-file-name name version))
(sha256
(base32
"0nz25z5b76xkgb9sh370hni3l946j07fr05cdwkdj9x7ibgsb6nj"))))
"1ycf6qcj8nbzk2js72priim4642lkn56w5kbny1nlryjkckxgm04"))))
(build-system ruby-build-system)
(arguments
`(#:test-target "spec"