From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 24 07:09:11 2022 Received: (at 55997) by debbugs.gnu.org; 24 Jun 2022 11:09:11 +0000 Received: from localhost ([127.0.0.1]:41146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4hBX-0003cp-9Q for submit@debbugs.gnu.org; Fri, 24 Jun 2022 07:09:11 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:36121) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4hBM-0003bL-5A for 55997@debbugs.gnu.org; Fri, 24 Jun 2022 07:09:00 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 24FA15C0208; Fri, 24 Jun 2022 07:08:55 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Fri, 24 Jun 2022 07:08:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= tom-fitzhenry.me.uk; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm2; t=1656068935; x=1656155335; bh=1Zv1ugHxPK NzHwWWw7XTpS8iEWepdyCeSMld4N2cXkE=; b=fpuug/4S59X3+evLWABpl8hM8O wcWxQzxCi8FSgFygf0FBdiueiB949lnLgG38bwXv7uw8O5EeWAOGnUbB+gf8GYMM 6jRnsbVst1Yb24Tr98p7T5BfCWaOBWp6pYsfCAyuvn1/ZbYV2X+VfnqDCem0W0wU LTfRPuSoSO568zv3/htoHAw0Pcj/vtGyi1RJTNVs3K0ZJCUb8BWFa5/Uvkg7s3o5 0RcmyU6EjeuMD6Ki0ocdMxFZWJK4TBc98OWNu2ZPLx1bTBzRw0AFrBETe5iayj6V cy1yRLvyz1D6AGBTyT33VWHB8I/e8/LYZJtk46EhbOgLBlAdRjk2nIwW8VPw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1656068935; x= 1656155335; bh=1Zv1ugHxPKNzHwWWw7XTpS8iEWepdyCeSMld4N2cXkE=; b=l 2/bqsUOR5JBUvfIFtzt1dpF6qq2VSLHNYDTVFkQcnCM3OmMZeYXwluedGpgj/Dgr F6xDcRzqAZAvjZrlN9l1/6BOsEil9xMJHicdE2NY/7mlua4rl8KBSIMH4kwhEosR dJ3vULfcXgtZO8a+Eogqqw6G4Nhs/9D467LL7uogk5dTQ8KD9I4iV5AXG4QnoRCr cdra7qw2P9liOWAnCAy71+atAVCYuNgayVIFC9HaLLPpFawhrAe/E3q0iwc2E2vC GY5DXiiJYWMzT5kRQMIPQNG8S7/K7dl9Fv7lTOX2U5iLbIesSseU8m1uH3dqv9JP nMIJJM1JuzGI5v0wrbzfg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudefledgfeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepvfhomhcuhfhithiihhgvnhhrhicuoehtohhmsehtohhm qdhfihhtiihhvghnrhihrdhmvgdruhhkqeenucggtffrrghtthgvrhhnpeeugeeiieekue eijeelvdduhedukeffteduhfelvdegjedvjeeileetheetffdtfeenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehtohhmsehtohhmqdhfihhtii hhvghnrhihrdhmvgdruhhk X-ME-Proxy: Feedback-ID: iefc945ae:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 24 Jun 2022 07:08:53 -0400 (EDT) From: Tom Fitzhenry To: 55997@debbugs.gnu.org Subject: [PATCH staging v2 4/5] gnu: Remove unused ruby-nokogiri-1.10. Date: Fri, 24 Jun 2022 21:08:37 +1000 Message-Id: <20220624110838.21580-5-tom@tom-fitzhenry.me.uk> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220624110838.21580-1-tom@tom-fitzhenry.me.uk> References: <20220624110838.21580-1-tom@tom-fitzhenry.me.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 55997 Cc: Tom Fitzhenry X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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. --- gnu/packages/ruby.scm | 48 +++++-------------------------------------- 1 file changed, 5 insertions(+), 43 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7119898fbc..d765a2c8ff 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5031,19 +5031,16 @@ (define-public ruby-mini-portile-2 (base32 "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy")))))) -;; TODO: In the next rebuild cycle, provide texlive a version of ruby-hydra -;; 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 +(define-public ruby-nokogiri (package (name "ruby-nokogiri") - (version "1.10.9") + (version "1.12.5") (source (origin (method url-fetch) (uri (rubygems-uri "nokogiri" version)) (sha256 (base32 - "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm")))) + "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b")))) (build-system ruby-build-system) (arguments ;; 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" (string-append "--with-xml2-include=" (assoc-ref %build-inputs "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))))) + "/include/libxml2" )))) (native-inputs (list ruby-hoe)) (inputs (list zlib libxml2 libxslt)) (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") (description "Nokogiri (鋸) parses and searches XML/HTML, and features both CSS3 selector and XPath 1.0 support.") @@ -5092,26 +5074,6 @@ (define-public ruby-mini-portile-2.6.1 (base32 "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 (package (name "ruby-method-source") -- 2.36.1