From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id EHMWFr/9qWJeYgEAbAwnHQ (envelope-from ) for ; Wed, 15 Jun 2022 17:41:51 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SO75Fb/9qWJaGQEAauVa8A (envelope-from ) for ; Wed, 15 Jun 2022 17:41:51 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0C58210998 for ; Wed, 15 Jun 2022 17:41:51 +0200 (CEST) Received: from localhost ([::1]:45306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1V9S-00056V-5K for larch@yhetil.org; Wed, 15 Jun 2022 11:41:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1Uaq-00009n-6X for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45546) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o1Uap-0003tU-T1 for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o1Uap-0000B9-O1 for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55997] [PATCH staging 4/4] gnu: Remove unused ruby-nokogiri-1.10. Resent-From: Tom Fitzhenry Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Jun 2022 15:06:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55997@debbugs.gnu.org Cc: Tom Fitzhenry Received: via spool by 55997-submit@debbugs.gnu.org id=B55997.1655305526598 (code B ref 55997); Wed, 15 Jun 2022 15:06:03 +0000 Received: (at 55997) by debbugs.gnu.org; 15 Jun 2022 15:05:26 +0000 Received: from localhost ([127.0.0.1]:39438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1UaE-00009a-B4 for submit@debbugs.gnu.org; Wed, 15 Jun 2022 11:05:26 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:48283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1UaC-000094-B1 for 55997@debbugs.gnu.org; Wed, 15 Jun 2022 11:05:24 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id B74443200B57; Wed, 15 Jun 2022 11:05:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 15 Jun 2022 11:05:18 -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=1655305518; x=1655391918; bh=lFz1cZB+YQ N77btwKti9pS3VfPj/41+X6fYYwtfrrdI=; b=fEGdr7mRY1+0K6AEfmKPXY+yRz gTuY5eVn3A6Ji4vfRjmbbpg4DqUHF9OBrFvlcrmGrRA/9mES+TBsYEDbld/HRG5j zDkyGrsN87tetgoM8eZf2byTIBPN1alx09+nL5BkvpdxXiZvi1ezaoldGBptNrxQ blIKqWxxXpsZVuk+2GFAQG5VLFir4HJVxnai13yzw3iTFIUA5rPJerK1h9+O98X3 raGsXdt3qoqQzQuNUfnpVfHMSynSL+G3cRrgVdLR9roQvjnh/jrjZs7MGxkVB9Ke PrXOLSFPJ8x5SLprelFdlgKkISPL8ZeL6W+rIwS7NxJLwmb3kc7Pa7EW2d/A== 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=1655305518; x= 1655391918; bh=lFz1cZB+YQN77btwKti9pS3VfPj/41+X6fYYwtfrrdI=; b=g xFnaD5AtVef5R6e64ZYzv4voCVcEOwISfZCE7NI0xXcYlOG6ut42oXc/7e3JWz5q GFfmqyw0HsZQC7/2fnW26rXu3tlnNji+l5U3poEOZyddtuvvqecsMBq8cb2yZ9p5 erQElNyOdd6xfLBwFd4LOhaexSjqODBxqBqNsja/tT79JBs3znCfAwzCAHNm3WND n00RRBzwJNGs/LDVlVJyox6RWc0FDBs12wKtC8g9R/i+1nFdMc33u1VXP9JX5PPL B78AI8kdy6xrKw0Q0YQ6KcC1R7gxZqT5+em/Dj6qO1R3blbuUE/SfWvix++c13ZA G0AI55eoHLaixSInPxdsA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedruddvuddgkeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepvfhomhcuhfhithiihhgvnhhrhicuoehtohhmsehtohhm qdhfihhtiihhvghnrhihrdhmvgdruhhkqeenucggtffrrghtthgvrhhnpeeugeeiieekue eijeelvdduhedukeffteduhfelvdegjedvjeeileetheetffdtfeenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehtohhmsehtohhmqdhfihhtii hhvghnrhihrdhmvgdruhhk X-ME-Proxy: Feedback-ID: iefc945ae:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 15 Jun 2022 11:05:16 -0400 (EDT) From: Tom Fitzhenry Date: Thu, 16 Jun 2022 01:04:34 +1000 Message-Id: <20220615150434.11604-4-tom@tom-fitzhenry.me.uk> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615150434.11604-1-tom@tom-fitzhenry.me.uk> References: <20220615145805.3189-1-tom@tom-fitzhenry.me.uk> <20220615150434.11604-1-tom@tom-fitzhenry.me.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1655307711; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=lFz1cZB+YQN77btwKti9pS3VfPj/41+X6fYYwtfrrdI=; b=MXc2RcdriGcuWteRNYL9cY3hEkAtrQQt/R6a+V0SMgn+UoGtBtsYPaTM8jCKaFK6lQH7DR GLTa1ahoTdIPzucTQb4H10ZftFQP8IRn+x5+ZHHbA8wgBdaz4FtfcucksxSFasO9BtI0/T uA+wYpN/K2pa/93dcBxI9IDA5fsu9q4xciqhABHCxAF17Cv5/pr++tKeU4DV2acMfThXGg jywB2PAvrxsmeslz951fPZ/SpER5mtsxsLIyJ4oJ+P0MG736WE1/iimOr3LAFdbcrP4GXk aLYihta0YTR8/f26rM3F1Fk7RFjO+OWJW+IkhTJOaPD7e2jHsIMLjfuSlhjmEA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655307711; a=rsa-sha256; cv=none; b=US3kQ61njuSdfEbEsyJIPRpnVh6WV7hx5/ap2eH8bPtmsOfdCo+FSKez1Sb9eYNggpt/LJ dLTQUhP22XwF6jtN1+qVx2WsyXqjHawZEkIv4MUNOXAc6IRH2GrAWd6kqoeA7NObqdWWKV NLehBPc2X9+DYUJrCoL/XRiX818xsvYbTdNm9NHxa0TIlpJ5L7h+m/abiFEa0mHTBZR4/C rVNfZ7aht/7/sKCi1UlFcrEnk4PmSQ8H/6g8jgn5Ljy1TZGLGz3kgu5FIm8qs+MMX4u4yq CIBKhG2yRrgeh2hUbkbBp+PsEy8ftVgE2iavYnJY4cvctIKDVeBrl7DTza9YMA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tom-fitzhenry.me.uk header.s=fm2 header.b=fEGdr7mR; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b="g xFnaD5"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tom-fitzhenry.me.uk (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.41 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tom-fitzhenry.me.uk header.s=fm2 header.b=fEGdr7mR; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b="g xFnaD5"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tom-fitzhenry.me.uk (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 0C58210998 X-Spam-Score: 5.41 X-Migadu-Scanner: scn0.migadu.com X-TUID: oAOPmReCswzR 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 ffa04b52cf..b3d8181587 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5030,19 +5030,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, @@ -5051,28 +5048,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.") @@ -5091,26 +5073,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