mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-02 08:07:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ruby-asciidoctor-pdf: Update to 1.6.1.

Browse source 
* gnu/packages/ruby.scm (ruby-asciidoctor-pdf): Update to 1.6.1.
[arguments]: Remove trailing #t's.
This commit is contained in:
Marius Bakke 2021-12-11 20:02:12 +01:00
parent 539031ed86
commit 9896e828ca
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 65 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
gnu/packages/ruby.scm
View file

@ -1831,76 +1831,69 @@ (define-public ruby-open-uri-cached
(license license:expat))) (license license:expat)))
(define-public ruby-asciidoctor-pdf (define-public ruby-asciidoctor-pdf
;; Use the latest commit, as the last tag doesn't build with the (package
;; latest Ruby dependencies in Guix. (name "ruby-asciidoctor-pdf")
(let ((revision "1") (version "1.6.1")
(commit "d257440df895d1595a3825ef58b32e4b290ba1c3")) (source
(package (origin
(name "ruby-asciidoctor-pdf") (method git-fetch) ;no test suite in the distributed gem
(version (git-version "1.5.3" revision commit)) (uri (git-reference
(source (url "https://github.com/asciidoctor/asciidoctor-pdf")
(origin (commit (string-append "v" version))))
(method git-fetch) ;no test suite in the distributed gem (file-name (git-file-name name version))
(uri (git-reference (sha256
(url "https://github.com/asciidoctor/asciidoctor-pdf") (base32
(commit commit))) "1iyfy6n9d3rkyrfjmnnfb44c76mq1larmkv1x8n6p5nbm33wb9sf"))))
(file-name (git-file-name name version)) (build-system ruby-build-system)
(sha256 (arguments
(base32 `(#:test-target "spec"
"1563d11ghzsrsg4inwfwj6b9hb5sk5b429f49fwq5qg3sq76kgjj")))) #:phases
(build-system ruby-build-system) (modify-phases %standard-phases
(arguments (add-after 'unpack 'remove-failing-tests
`(#:test-target "spec" ;; Two tests module fail for unknown reasons, *only* when
#:phases ;; ran in the build container (see:
(modify-phases %standard-phases ;; https://github.com/asciidoctor/asciidoctor-pdf/issues/1725#issuecomment-658777965).
(add-after 'unpack 'remove-failing-tests (lambda _
;; Two tests module fail for unknown reasons, *only* when (delete-file "spec/audio_spec.rb")
;; ran in the build container (see: (delete-file "spec/video_spec.rb")))
;; https://github.com/asciidoctor/asciidoctor-pdf/issues/1725#issuecomment-658777965). (add-after 'extract-gemspec 'strip-version-requirements
(lambda _ (lambda _
(delete-file "spec/audio_spec.rb") (substitute* "asciidoctor-pdf.gemspec"
(delete-file "spec/video_spec.rb") (("(.*add_.*dependency '[_A-Za-z0-9-]+').*" _ stripped)
#t)) (string-append stripped "\n")))))
(add-after 'extract-gemspec 'strip-version-requirements ;; The tests rely on the Gem being installed, so move the check phase
(lambda _ ;; after the install phase.
(substitute* "asciidoctor-pdf.gemspec" (delete 'check)
(("(.*add_.*dependency '[_A-Za-z0-9-]+').*" _ stripped) (add-after 'install 'check
(string-append stripped "\n"))) (lambda* (#:key outputs tests? #:allow-other-keys)
#t)) (let ((new-gem (string-append (assoc-ref outputs "out")
;; The tests rely on the Gem being installed, so move the check phase "/lib/ruby/vendor_ruby")))
;; after the install phase. (setenv "GEM_PATH"
(delete 'check) (string-append (getenv "GEM_PATH") ":" new-gem))
(add-after 'install 'check (when tests?
(lambda* (#:key outputs tests? #:allow-other-keys) (invoke "rspec" "-t" "~visual" "-t" "~cli" "-t" "~network"))))))))
(let ((new-gem (string-append (assoc-ref outputs "out") (native-inputs
"/lib/ruby/vendor_ruby"))) `(("ruby-chunky-png" ,ruby-chunky-png)
(setenv "GEM_PATH" ("ruby-coderay" ,ruby-coderay)
(string-append (getenv "GEM_PATH") ":" new-gem)) ("ruby-pdf-inspector" ,ruby-pdf-inspector)
(when tests? ("ruby-rouge" ,ruby-rouge)
(invoke "rspec" "-t" "~visual" "-t" "~cli" "-t" "~network")) ("ruby-rspec" ,ruby-rspec)))
#t)))))) (propagated-inputs
(native-inputs `(("ruby-asciidoctor" ,ruby-asciidoctor)
`(("ruby-chunky-png" ,ruby-chunky-png) ("ruby-concurrent-ruby" ,ruby-concurrent)
("ruby-coderay" ,ruby-coderay) ("ruby-open-uri-cached" ,ruby-open-uri-cached)
("ruby-pdf-inspector" ,ruby-pdf-inspector) ("ruby-prawn" ,ruby-prawn)
("ruby-rouge" ,ruby-rouge) ("ruby-prawn-icon" ,ruby-prawn-icon)
("ruby-rspec" ,ruby-rspec))) ("ruby-prawn-svg" ,ruby-prawn-svg)
(propagated-inputs ("ruby-prawn-table" ,ruby-prawn-table)
`(("ruby-asciidoctor" ,ruby-asciidoctor) ("ruby-prawn-templates" ,ruby-prawn-templates)
("ruby-concurrent-ruby" ,ruby-concurrent) ("ruby-safe-yaml" ,ruby-safe-yaml)
("ruby-open-uri-cached" ,ruby-open-uri-cached) ("ruby-text-hyphen" ,ruby-text-hyphen)
("ruby-prawn" ,ruby-prawn) ("ruby-thread-safe" ,ruby-thread-safe)
("ruby-prawn-icon" ,ruby-prawn-icon) ("ruby-treetop" ,ruby-treetop)
("ruby-prawn-svg" ,ruby-prawn-svg) ("ruby-ttfunk" ,ruby-ttfunk)))
("ruby-prawn-table" ,ruby-prawn-table) (synopsis"AsciiDoc to Portable Document Format (PDF)} converter")
("ruby-prawn-templates" ,ruby-prawn-templates) (description "Asciidoctor PDF is an extension for Asciidoctor that
("ruby-safe-yaml" ,ruby-safe-yaml)
("ruby-text-hyphen" ,ruby-text-hyphen)
("ruby-thread-safe" ,ruby-thread-safe)
("ruby-treetop" ,ruby-treetop)
("ruby-ttfunk" ,ruby-ttfunk)))
(synopsis"AsciiDoc to Portable Document Format (PDF)} converter")
(description "Asciidoctor PDF is an extension for Asciidoctor that
converts AsciiDoc documents to Portable Document Format (PDF) using the Prawn converts AsciiDoc documents to Portable Document Format (PDF) using the Prawn
PDF library. It has features such as: PDF library. It has features such as:
@itemize @itemize
@ -1923,8 +1916,8 @@ (define-public ruby-asciidoctor-pdf
@item Custom TrueType (TTF) fonts @item Custom TrueType (TTF) fonts
@item Double-sided printing mode (margins alternate on recto and verso pages) @item Double-sided printing mode (margins alternate on recto and verso pages)
@end itemize") @end itemize")
(home-page "https://asciidoctor.org/docs/asciidoctor-pdf") (home-page "https://asciidoctor.org/docs/asciidoctor-pdf")
(license license:expat)))) (license license:expat)))
(define-public ruby-ast (define-public ruby-ast
(package (package