ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 05:39:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Remove unused ruby-nokogiri-1.10.

Browse source 
As of commit "gnu: unpin ruby-nokogiri-diff's ruby-nokogiri",
ruby-nokogiri-1.10 is unused, so let's remove it.

ruby-nokogiri-1.10's purpose was to cut the dependency graph. Users should use
ruby-nokogiri.

* gnu/packages/ruby.scm (ruby-nokogiri-1.10): Remove variable.
(ruby-nokogiri): Collapse the package inheritance.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Tom Fitzhenry 2022-06-24 21:08:37 +10:00 committed by Ludovic Courtès
parent 22225620e3
commit 8f25dd57d6
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
gnu/packages/ruby.scm
View file

@ -5031,19 +5031,16 @@ (define-public ruby-mini-portile-2
(base32 (base32
"15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy")))))) "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"))))))
;; TODO: In the next rebuild cycle, provide texlive a version of ruby-hydra (define-public ruby-nokogiri
;; that does not depend on byebug and rspec, so that their dependencies can
;; be updated more freely. For now pin this version to avoid rebuilds.
(define-public ruby-nokogiri-1.10
(package (package
(name "ruby-nokogiri") (name "ruby-nokogiri")
(version "1.10.9") (version "1.12.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (rubygems-uri "nokogiri" version)) (uri (rubygems-uri "nokogiri" version))
(sha256 (sha256
(base32 (base32
"12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm")))) "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"))))
(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,
@ -5052,28 +5049,13 @@ (define-public ruby-nokogiri-1.10
#: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
(modify-phases %standard-phases
(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")))
(substitute* "ext/nokogiri/extconf.rb"
(("gem 'pkg-config'.*")
(string-append "$:.unshift '"
pkg-config "/lib/ruby/vendor_ruby"
"/gems/pkg-config-"
,(package-version ruby-pkg-config)
"/lib'\n"))))
#t)))))
(native-inputs (native-inputs
(list ruby-hoe)) (list ruby-hoe))
(inputs (inputs
(list zlib libxml2 libxslt)) (list zlib libxml2 libxslt))
(propagated-inputs (propagated-inputs
(list ruby-mini-portile-2 ruby-pkg-config)) (list ruby-mini-portile-2.6.1 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.")
@ -5092,26 +5074,6 @@ (define-public ruby-mini-portile-2.6.1
(base32 (base32
"1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq")))))) "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"))))))
(define-public ruby-nokogiri
(package
(inherit ruby-nokogiri-1.10)
(version "1.12.5")
(source (origin
(method url-fetch)
(uri (rubygems-uri "nokogiri" version))
(sha256
(base32
"1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"))))
(arguments
'(#:tests? #f ;XXX: no tests in rubygem
#:gem-flags (list "--" "--use-system-libraries"
(string-append "--with-xml2-include="
(assoc-ref %build-inputs "libxml2")
"/include/libxml2"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs ruby-nokogiri-1.10)
(replace "ruby-mini-portile" ruby-mini-portile-2.6.1)))))
(define-public ruby-method-source (define-public ruby-method-source
(package (package
(name "ruby-method-source") (name "ruby-method-source")