From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id YIZMBAuvIWClHgAA0tVLHw (envelope-from ) for ; Mon, 08 Feb 2021 21:37:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id cKQnAAuvIWDWLwAAB5/wlQ (envelope-from ) for ; Mon, 08 Feb 2021 21:37:15 +0000 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 935229403AA for ; Mon, 8 Feb 2021 21:37:14 +0000 (UTC) Received: from localhost ([::1]:56074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9EDY-0006MC-6Q for larch@yhetil.org; Mon, 08 Feb 2021 16:37:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9AJV-0002IH-QO for guix-patches@gnu.org; Mon, 08 Feb 2021 12:27:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40287) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l9AJT-0001oy-VA for guix-patches@gnu.org; Mon, 08 Feb 2021 12:27:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l9AJT-00055M-Sh for guix-patches@gnu.org; Mon, 08 Feb 2021 12:27:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46145] [PATCH 5/5] gnu: jekyll: Update to 4.2.0. Resent-From: EuAndreh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Feb 2021 17:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46145 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: mail@nicolasgoaziou.fr, 46145@debbugs.gnu.org Cc: EuAndreh Received: via spool by 46145-submit@debbugs.gnu.org id=B46145.161280520019487 (code B ref 46145); Mon, 08 Feb 2021 17:27:03 +0000 Received: (at 46145) by debbugs.gnu.org; 8 Feb 2021 17:26:40 +0000 Received: from localhost ([127.0.0.1]:51829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l9AJ5-00054D-VG for submit@debbugs.gnu.org; Mon, 08 Feb 2021 12:26:40 -0500 Received: from box.euandre.org ([46.101.160.115]:44255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l9AJ1-00053N-Qi for 46145@debbugs.gnu.org; Mon, 08 Feb 2021 12:26:36 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id C9A41FC4A4; Mon, 8 Feb 2021 14:26:28 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1612805190; bh=KnoV8AyhEe8P8N/I79++kruQSvuPKlQwO66rqnPs5Fw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CetenkvXQHBjXPZYl+mp/96bWQfy/ZCVv52qg+7+wBMO+7oQwMQ7vzQknLUy2oAve I5gSdQr5W4kou5rz7exbEe8CBFKVz0iA9BV+Ome2IvdNZLk/kqbdM8DSozEF2esk38 Yv6E5GgUcKN3D250dqFrQa9TvYgcQ1K4Lkw3pwlN8IEUMHCLUWwapyTfpYv9B0lSz9 S9bXWHPeq5UvcmlciZhHgs1FUMgbMYu5a1dU35aOfk08CfxvPFvWmPLyuot926c200 F1m6RqpEH9abGcN7gZ21sUVDvoq+h8hjBDLiwsVijT59YHfSL9o3D1s1Cez5xXJPYU 0y0bJ6xwMsvmg== Date: Mon, 8 Feb 2021 14:26:17 -0300 Message-Id: <20210208172617.11247-5-eu@euandre.org> In-Reply-To: <20210208172617.11247-1-eu@euandre.org> References: <87pn1dwr43.fsf@nicolasgoaziou.fr> <20210208172617.11247-1-eu@euandre.org> MIME-Version: 1.0 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" Reply-to: EuAndreh X-ACL-Warn: , EuAndreh via Guix-patches From: EuAndreh via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 1.14 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=euandre.org header.s=mail header.b=CetenkvX; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 935229403AA X-Spam-Score: 1.14 X-Migadu-Scanner: scn1.migadu.com X-TUID: Ima1NBPpN5iw * gnu/packages/ruby.scm (ruby-rouge-2): Remove variable. * gnu/packages/ruby.scm (jekyll): Update to 4.2.0. [propagated-inputs]: Use newer version or ruby-rouge, add ruby-sassc and ruby-terminal-table. --- gnu/packages/ruby.scm | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c1a1c3fc1f..9d855aeca0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -10982,17 +10982,6 @@ is compatible with stylesheets designed for pygments.") ;; pygments is licensed under bsd-2 license:bsd-2)))) -(define-public ruby-rouge-2 - (package - (inherit ruby-rouge) - (version "2.2.1") - (source (origin - (method url-fetch) - (uri (rubygems-uri "rouge" version)) - (sha256 - (base32 - "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs")))))) - (define-public ruby-hashie (package (name "ruby-hashie") @@ -11201,13 +11190,13 @@ Unicode formatted tables.") (define-public jekyll (package (name "jekyll") - (version "3.8.6") + (version "4.2.0") (source (origin (method url-fetch) (uri (rubygems-uri "jekyll" version)) (sha256 (base32 - "1ph1jjjl25vmzif7bvxzviq7azjm384pm7ba4k24cah94285bzhz")))) + "0cqkh78jw8scrajyx5nla0vwm9fvp2qql3kdcvvplcq9mazy8snq")))) (build-system ruby-build-system) (arguments ;; No rakefile, but a test subdirectory. @@ -11231,8 +11220,10 @@ Unicode formatted tables.") ("ruby-liquid" ,ruby-liquid) ("ruby-mercenary" ,ruby-mercenary) ("ruby-pathutil" ,ruby-pathutil) - ("ruby-rouge" ,ruby-rouge-2) - ("ruby-safe-yaml" ,ruby-safe-yaml))) + ("ruby-rouge" ,ruby-rouge) + ("ruby-safe-yaml" ,ruby-safe-yaml) + ("ruby-sassc" ,ruby-sassc) + ("ruby-terminal-table" ,ruby-terminal-table))) (home-page "https://jekyllrb.com/") (synopsis "Static site generator") (description "Jekyll is a simple, blog aware, static site generator.") -- 2.30.0