From patchwork Tue Jul 9 14:18:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 29088 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1250227BBEA; Tue, 9 Jul 2024 15:20:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 67C7D27BBE2 for ; Tue, 9 Jul 2024 15:20:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sRBhI-0007DJ-W1; Tue, 09 Jul 2024 10:20:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sRBhG-0007BE-8Z for guix-patches@gnu.org; Tue, 09 Jul 2024 10:19:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sRBhF-0001I1-WC for guix-patches@gnu.org; Tue, 09 Jul 2024 10:19:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sRBhK-0001WZ-F6; Tue, 09 Jul 2024 10:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72009] [PATCH 2/2] gnu: ruby-libxml: Use newer package style. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, guix-patches@gnu.org Resent-Date: Tue, 09 Jul 2024 14:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72009 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72009@debbugs.gnu.org Cc: gemmaro , Christopher Baines X-Debbugs-Original-Xcc: Christopher Baines Received: via spool by 72009-submit@debbugs.gnu.org id=B72009.17205347935827 (code B ref 72009); Tue, 09 Jul 2024 14:20:02 +0000 Received: (at 72009) by debbugs.gnu.org; 9 Jul 2024 14:19:53 +0000 Received: from localhost ([127.0.0.1]:53837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRBhB-0001Vv-0p for submit@debbugs.gnu.org; Tue, 09 Jul 2024 10:19:53 -0400 Received: from mail-pj1-f42.google.com ([209.85.216.42]:47301) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRBh8-0001Vh-RP for 72009@debbugs.gnu.org; Tue, 09 Jul 2024 10:19:51 -0400 Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2c1a4192d55so3020123a91.2 for <72009@debbugs.gnu.org>; Tue, 09 Jul 2024 07:19:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720534719; x=1721139519; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gUPmj5Gfl4hoRQPjGYAm6XUn1ZmTMPBkUrsTjJ4112c=; b=QDZeL7/RBPxTAigAOPHJ19JIHuJfSYlihTa6IngeObmuUrAv16QZiYBpNHjx2o5t4m XdPLhvc23U65Am6DY1y8H3ePAC8tBEPDEScndXTXQshyPiYWDau4scflQfDlxs//bWpQ OVEdRhr4A7ElVCMcmRdkIo3ocP31hEsXiNToYGvtKxFStJhgg/C04vkM9n1Mcc9fHx4K 8BXW1EXHsoAVfgg/srQqKTOqsChB3lhZxNyYwD6THXHeymcp5bUY3zkFpZ3JMvghRKfu j+HeYttxCbBfm7SXbvJ5182R91Avtc40qCL0cSsqg/GVJl2q3LjUXqJEqFTP+yG0gG7s bCaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720534719; x=1721139519; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gUPmj5Gfl4hoRQPjGYAm6XUn1ZmTMPBkUrsTjJ4112c=; b=gNuQDDywm60Fz+W03BIsLl39PSeieMiyC1uwiMhJtPISfghyUnFLZMUJ1csKbJQmsl s58Lm6QhRL5m/v1GQfxFY+gS3u5f/Q2H7H6kGiSjBQLsMmydOL4K1uD4VXyrl63am3bG 6befkEUYNE139tN0v7BrKCyGDPEvh6ufc2fxmLMsHcghbWU7jF0BozKDtpZI59fcE6q9 YI97s5rumZZnjSSysEvlLxwGZKsVARrqcIBK00ygMxvUprMjaCM27+rlhxk4g8UUD7so q8EXRLOR0XPihp55TuP0RdgUrV7iqU742grA+yvjQfT1XvyF3eFXeMyR0z4zzIcwWZgX rvnA== X-Gm-Message-State: AOJu0YwgOfzSki1HvfrJtrb5z/1JzcW4H9cgpg4OahXe0djW9a0Edgbd EVavgRgIIca+1upTyrfjhQHVc0I0B5L/8zBtQMwky16xlU7mA9vD1/6Wh8ay X-Google-Smtp-Source: AGHT+IE9BwHaozfHASdBNS5t5muhit060CGQlpfYqcfIPhUrrZCZEsFP70pXahPqhx16eH2Vlqd04w== X-Received: by 2002:a17:90b:4ac9:b0:2c9:5cd0:bedc with SMTP id 98e67ed59e1d1-2ca35c2b035mr2391062a91.15.1720534719460; Tue, 09 Jul 2024 07:18:39 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ca3c74f184sm741602a91.0.2024.07.09.07.18.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 07:18:39 -0700 (PDT) From: gemmaro Date: Tue, 9 Jul 2024 23:18:21 +0900 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ruby.scm (ruby-libxml)[arguments]: Convert to list of G-Expressions. Use #$output rather than the outputs alist. Change-Id: If46c6d1a28358be03f854082570c913ee7f80cc7 --- gnu/packages/ruby.scm | 65 ++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 74877ac4a9..fa2d474e4c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3224,38 +3224,39 @@ (define-public ruby-libxml (inputs (list zlib libxml2)) (arguments - '(#:gem-flags - (list "--no-document" ; TODO: Re-enable when documentation - ; generation works - "--" - (string-append "--with-xml2-include=" - (assoc-ref %build-inputs "libxml2") - "/include/libxml2")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-failing-tests - (lambda _ - (for-each - (lambda (method) - (substitute* "test/test_canonicalize.rb" - (((string-append "def " method) def) - (string-append def "; skip \"CR/LF mismatch\";")))) - '("test_canonicalize_with_w3c_c14n_3_1" - "test_canonicalize_with_w3c_c14n_3_2" - "test_canonicalize_with_w3c_c14n_3_3" - "test_canonicalize_with_w3c_c14n_3_4")) - (substitute* "test/test_schema.rb" - (("def test_schema_load_from_uri" def) - (string-append def "; skip \"missing XLink schema\";"))))) - (delete 'check) - (add-after 'install 'set-gem-path - (lambda* (#:key outputs #:allow-other-keys) - (setenv "GEM_PATH" - (string-append - (getenv "GEM_PATH") ":" - (assoc-ref outputs "out") "/lib/ruby/vendor_ruby")))) - (add-after 'set-gem-path 'check - (assoc-ref %standard-phases 'check))))) + (list + #:gem-flags #~(list + ;; TODO: Re-enable when documentation generation works + "--no-document" "--" + (string-append "--with-xml2-include=" + (assoc-ref %build-inputs "libxml2") + "/include/libxml2")) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'skip-failing-tests + (lambda _ + (for-each (lambda (method) + (substitute* "test/test_canonicalize.rb" + (((string-append "def " method) + def) + (string-append def + "; skip \"CR/LF mismatch\";")))) + '("test_canonicalize_with_w3c_c14n_3_1" + "test_canonicalize_with_w3c_c14n_3_2" + "test_canonicalize_with_w3c_c14n_3_3" + "test_canonicalize_with_w3c_c14n_3_4")) + (substitute* "test/test_schema.rb" + (("def test_schema_load_from_uri" def) + (string-append def + "; skip \"missing XLink schema\";"))))) + (delete 'check) + (add-after 'install 'set-gem-path + (lambda _ + (setenv "GEM_PATH" + (string-append (getenv "GEM_PATH") ":" + #$output "/lib/ruby/vendor_ruby")))) + (add-after 'set-gem-path 'check + (assoc-ref %standard-phases + 'check))))) (synopsis "Ruby bindings for GNOME Libxml2") (description "The Libxml-Ruby project provides Ruby language bindings for the GNOME Libxml2 XML toolkit.")