From patchwork Mon Mar 20 17:29:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48395 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 AC1E516F2D; Mon, 20 Mar 2023 17:39:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED 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 37F1316F13 for ; Mon, 20 Mar 2023 17:39:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJTM-0007Ee-9y; Mon, 20 Mar 2023 13:39:04 -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 1peJTK-0007EM-Q9 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peJTK-00042S-6c for guix-patches@gnu.org; Mon, 20 Mar 2023 13:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJTK-0005Ab-3D for guix-patches@gnu.org; Mon, 20 Mar 2023 13:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 221/223] gnu: ruby-liquid: Update to 5.4.0 and enable tests. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62196 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62196@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 62196-submit@debbugs.gnu.org id=B62196.167933389019780 (code B ref 62196); Mon, 20 Mar 2023 17:39:02 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:38:10 +0000 Received: from localhost ([127.0.0.1]:56529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJST-00058x-PP for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:38:10 -0400 Received: from mail-yw1-f175.google.com ([209.85.128.175]:45833) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJSS-00058i-Dh for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:38:09 -0400 Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-5418d54d77bso236689187b3.12 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:38:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333882; 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=5g+3mWVFx2PKTqni8RbqvXIl6C8wuLdrFqidUscmARA=; b=D3HmYpRv2gikwLf2Q5bvZ7LRgsQLFu6tZF3T+dX/+jL6rIJVGo5ZwMCO6aXtolwTIl xqOgiLghuOMZ4FEAw/UR8Wp+3lhvH+llnvwYfsKUEY23mz1SYuGyq2ObKY9NGwDWo02g qZg3zeUG0Ci3nLA+kV6dHzQMPHICU1eQz2xs/U9NtHnEo29l0/9umGJ6k4eP3M3JAFYA YH1mB/oW7eCWXz9ePlGHirhay1XWsWuzKZ9UEZ65rHFK7KXSO+st2qbTXjS88vEIlpON 03y9oBdarz7aF7jxa+qEdri6D5Qjq/B6SDwKzNRN89+dzd8B1c1RN8nD1TVnYWSDOCW8 MViQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333882; 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=5g+3mWVFx2PKTqni8RbqvXIl6C8wuLdrFqidUscmARA=; b=HCz7LvcE0GNecv6AAAzw56sLLxN6cQta6tOM0El8AotdGXbLZ6GKtXCtMQLhIQf8Oq DtC6PTGKCPbawENM3eiF2UMe+uy2BuFrOv2fA85TnyEqta3RB3+LspgZTDIaHg5Cket7 mMeRTkQRU0o8GQcm/Ebt6iz2HQkea/zsH7e90RWKtMJCTedvsofsvlnhej/IqUcOR+Mk uhiqBJNafNnHphO1gV8kCmywUDB3Z1Pfg83r/WCc1OzCx+VKt8SkMgGhUsZpu/QXmv3D SRr+pF0D5FIvNPVdQ1c2+PAowFjOGQmH+sM6HPiJmL9qiLuRoRzaqzYlbadZNc8281AU 5B0Q== X-Gm-Message-State: AO0yUKUxUWmw/GQzDAx2y9ee1VfuTx9VO2v3IfadTi/4WIrtHKh/jFzj l5nJkk9mPCBOukQlj7IkajezuVWifcE= X-Google-Smtp-Source: AK7set/N0P0utIkxSTEiuYrsR5J4n+7+X2GNm3m59FQBNyq1AJrzJIKGyruVH9c9dRDbdC1T6J25Rw== X-Received: by 2002:a05:6214:23cf:b0:5b6:eef9:b8f7 with SMTP id hr15-20020a05621423cf00b005b6eef9b8f7mr25990402qvb.6.1679333397664; Mon, 20 Mar 2023 10:29:57 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id g2-20020a37b602000000b0071aacb2c76asm7536708qkf.132.2023.03.20.10.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:29:57 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:29:31 -0400 Message-Id: <20230320172933.13101-20-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320172933.13101-1-maxim.cournoyer@gmail.com> References: <20230320172933.13101-1-maxim.cournoyer@gmail.com> 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-liquid): Update to 5.4.0. [arguments]: Enable tests. Add #:phases. [native-inputs]: New field. (ruby-liquid-4): New variable. (jekyll) [propagated-inputs]: Replace ruby-liquid with ruby-liquid-4. --- gnu/packages/ruby.scm | 48 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 6968362504..7daacd706e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -13452,21 +13452,57 @@ (define-public ruby-launchy (define-public ruby-liquid (package (name "ruby-liquid") - (version "4.0.3") + (version "5.4.0") (source (origin - (method url-fetch) - (uri (rubygems-uri "liquid" version)) + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/Shopify/liquid") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by")))) + "1qdnvd1f9zs6wyilcgxyh93wis7ikbpimjxfpbkpk2ngr1m2c8la")))) (build-system ruby-build-system) - (arguments `(#:tests? #f)); No rakefile + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (delete 'check) ;moved after the install phase + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'check 'set-GEM_PATH + (lambda _ + (setenv "GEM_PATH" (string-append + (getenv "GEM_PATH") ":" + #$output "/lib/ruby/vendor_ruby")))) + (add-before 'check 'delete-problematic-tests + (lambda _ + ;; The following test fails with 'Unknown tag' errors (see: + ;; https://github.com/Shopify/liquid/issues/1699). + (delete-file "test/integration/tags/inline_comment_test.rb")))))) + (native-inputs (list ruby-liquid-c-bootstrap ruby-rspec ruby-stackprof)) (home-page "https://shopify.github.io/liquid/") (synopsis "Template language") (description "Liquid is a template language written in Ruby. It is used to load dynamic content on storefronts.") (license license:expat))) +(define-public ruby-liquid-4 + (package + (inherit ruby-liquid) + (name "ruby-liquid") + (version "4.0.4") + (source (origin + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/Shopify/liquid") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cr321nd0zkbxirgdfmz37xx7j26zfnicjh585fi20vx60frry83")))) + (arguments (list #:tests? #f)))) ;avoid required an older ruby-liquid-c + ;;; This variant is purposefully incomplete, lacking ruby-liquid so that it ;;; can be used for ruby-liquid's test suite. (define ruby-liquid-c-bootstrap @@ -13701,7 +13737,7 @@ (define-public jekyll ruby-jekyll-sass-converter ruby-jekyll-watch ruby-kramdown-parser-gfm - ruby-liquid + ruby-liquid-4 ruby-mercenary ruby-pathutil ruby-rouge