mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-20 06:26:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ruby-nokogiri: Update to 1.6.8.

Browse source 
* gnu/packages/ruby.scm (ruby-nokogiri): Update to 1.6.8.
[arguments]: Remove 'update-dependency' phase.  Add 'patch-extconf' phase.
[native-inputs]: Remove ruby-rake-compiler.
[propagated-inputs]: Add ruby-pkg-config.
This commit is contained in:
Ben J Woodcroft 2016-08-01 11:27:00 +10:00 committed by Ben Woodcroft
parent 2de61e340c
commit 7b01f250e4
No known key found for this signature in database
GPG key ID: E44DCCD146E0CCF4
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/ruby.scm
View file

@ -1909,37 +1909,48 @@ (define-public ruby-mini-portile-2
(define-public ruby-nokogiri (define-public ruby-nokogiri
(package (package
(name "ruby-nokogiri") (name "ruby-nokogiri")
(version "1.6.7.2") (version "1.6.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (rubygems-uri "nokogiri" version)) (uri (rubygems-uri "nokogiri" version))
(sha256 (sha256
(base32 (base32
"11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv")))) "17pjhvm4yigriizxbbpx266nnh6nckdm33m3j4ws9dcg99daz91p"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
;; Tests fail because Nokogiri can only test with an installed extension, ;; Tests fail because Nokogiri can only test with an installed extension,
;; and also because many test framework dependencies are missing. ;; and also because many test framework dependencies are missing.
'(#:tests? #f `(#:tests? #f
#:gem-flags (list "--" "--use-system-libraries" #:gem-flags (list "--" "--use-system-libraries"
(string-append "--with-xml2-include=" (string-append "--with-xml2-include="
(assoc-ref %build-inputs "libxml2") (assoc-ref %build-inputs "libxml2")
"/include/libxml2" )) "/include/libxml2" ))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'extract-gemspec 'update-dependency (add-before 'build 'patch-extconf
(lambda _ ;; 'pkg-config' is not included in the GEM_PATH during
(substitute* ".gemspec" (("2.0.0.rc2") "2.0")) ;; installation, so we add it directly to the load path.
(lambda* (#:key inputs #:allow-other-keys)
(let* ((pkg-config (assoc-ref inputs "ruby-pkg-config"))
(pkg-config-home (gem-home pkg-config
,(package-version ruby))))
(substitute* "ext/nokogiri/extconf.rb"
(("gem 'pkg-config'.*")
(string-append "$:.unshift '"
pkg-config-home
"/gems/pkg-config-"
,(package-version ruby-pkg-config)
"/lib'\n"))))
#t))))) #t)))))
(native-inputs (native-inputs
`(("ruby-hoe" ,ruby-hoe) `(("ruby-hoe" ,ruby-hoe)))
("ruby-rake-compiler" ,ruby-rake-compiler)))
(inputs (inputs
`(("zlib" ,zlib) `(("zlib" ,zlib)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("libxslt" ,libxslt))) ("libxslt" ,libxslt)))
(propagated-inputs (propagated-inputs
`(("ruby-mini-portile" ,ruby-mini-portile-2))) `(("ruby-mini-portile" ,ruby-mini-portile-2)
("ruby-pkg-config" ,ruby-pkg-config)))
(synopsis "HTML, XML, SAX, and Reader parser for Ruby") (synopsis "HTML, XML, SAX, and Reader parser for Ruby")
(description "Nokogiri (鋸) parses and searches XML/HTML, and features (description "Nokogiri (鋸) parses and searches XML/HTML, and features
both CSS3 selector and XPath 1.0 support.") both CSS3 selector and XPath 1.0 support.")