aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen J Woodcroft <donttrustben@gmail.com>2016-08-01 11:27:00 +1000
committerBen Woodcroft <donttrustben@gmail.com>2016-08-01 21:30:49 +1000
commit7b01f250e406d4112959cb1099da5e73a099fe0f (patch)
tree7af862787e010b944218b61fb39df1394841be54
parent2de61e340c286b036d4cb8dea91c0f8709aac0bf (diff)
downloadguix-7b01f250e406d4112959cb1099da5e73a099fe0f.tar
guix-7b01f250e406d4112959cb1099da5e73a099fe0f.tar.gz
gnu: ruby-nokogiri: Update to 1.6.8.
* 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.
-rw-r--r--gnu/packages/ruby.scm29
1 files changed, 20 insertions, 9 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index bc7afa626c..0fe2c112aa 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -1909,37 +1909,48 @@ to reproduce user environments.")
(define-public ruby-nokogiri
(package
(name "ruby-nokogiri")
- (version "1.6.7.2")
+ (version "1.6.8")
(source (origin
(method url-fetch)
(uri (rubygems-uri "nokogiri" version))
(sha256
(base32
- "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv"))))
+ "17pjhvm4yigriizxbbpx266nnh6nckdm33m3j4ws9dcg99daz91p"))))
(build-system ruby-build-system)
(arguments
;; Tests fail because Nokogiri can only test with an installed extension,
;; and also because many test framework dependencies are missing.
- '(#:tests? #f
+ `(#:tests? #f
#:gem-flags (list "--" "--use-system-libraries"
(string-append "--with-xml2-include="
(assoc-ref %build-inputs "libxml2")
"/include/libxml2" ))
#:phases
(modify-phases %standard-phases
- (add-after 'extract-gemspec 'update-dependency
- (lambda _
- (substitute* ".gemspec" (("2.0.0.rc2") "2.0"))
+ (add-before 'build 'patch-extconf
+ ;; 'pkg-config' is not included in the GEM_PATH during
+ ;; 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)))))
(native-inputs
- `(("ruby-hoe" ,ruby-hoe)
- ("ruby-rake-compiler" ,ruby-rake-compiler)))
+ `(("ruby-hoe" ,ruby-hoe)))
(inputs
`(("zlib" ,zlib)
("libxml2" ,libxml2)
("libxslt" ,libxslt)))
(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")
(description "Nokogiri (鋸) parses and searches XML/HTML, and features
both CSS3 selector and XPath 1.0 support.")