From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id A446F56437; Wed, 31 Aug 2022 09:38:18 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 443EF563FB; Wed, 31 Aug 2022 09:38:15 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by atuin.qyliss.net (Postfix) with ESMTPS id CBDB0563E1 for ; Wed, 31 Aug 2022 09:38:08 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 021295C011C; Wed, 31 Aug 2022 05:38:08 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Wed, 31 Aug 2022 05:38:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1661938687; x=1662025087; bh=nq 9zDmoV45ZEUcADywU4SgOf8izXLntR4yS6fEPPgxE=; b=Rg7S2u2qVGAAB57YSP NOA/1eNfACJG4+SKO4ltP5AedTglh4aL1KoHLzvtEazJc3A6Dwwo3OIs3zW7gC4I ltsIob7RPOXHL5b49sqUyKf43muAZQcfqg84ru/j/YHLlKPBtK0knoUBwVSs5sVG VqsCgsq48IleHfynKCrEayPcwjrLyJK5ttYhcW5VTQP+DRMGMJy1phtJTaVoLYf9 6666rkodghGKgCAVzHBTcL/rr7FkbvM3EYh+Kse5w7Ln6srtxQxoSOe/n5Sfgvyk lzXVvh4IyEfdDsVqBewbIjUbGABvc+tSzLPnKz04TdIrptQpxfMZ9jWmeAfYw1tu zSJw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding: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=fm1; t=1661938687; x=1662025087; bh=nq9zDmoV45ZEU cADywU4SgOf8izXLntR4yS6fEPPgxE=; b=lE1xnDAGQp9VrvyBDMvRzIwGOzQBD UgRrE+iyfKGy8ziqr8jx8qQtBzsmg5g8vSDvZjl5hNLAlWpgmEwUBWGh5/0IL972 Tzwj66uWaoqnEuVbbQKZ3aWSVgQF+zYLQMrAdp8iXC/QgRdn6885DfennmVa3T13 p9ShvlnAy1lzZl47TTT/mctqeJ/V1yq3flB9ty2cOpZ00OPKfpyEieFIHRfjNzmf DXOxGD4CNauKKBJb8mWrDZ010duedBXpwqmn8/YC4P0q8Rgxt7sdP9jpvo+ViDcp 4NRwlsagtF6Y02JdY3hE+fTvRtj7wbPqpTKjoskcj7mJoog4Fj51nApng== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekhedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehlhihs shgrucftohhsshcuoehhihesrghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnhepve ffjeettdfhgeeuvdelkeefvdfhudefuddtledugfehheekvdegkeeikeekfeelnecuffho mhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrh grmhepmhgrihhlfhhrohhmpehqhihlihhsshesgidvvddtrdhqhihlihhsshdrnhgvth X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 31 Aug 2022 05:38:06 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id D250B735; Wed, 31 Aug 2022 09:37:54 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 3/4] Documentation/jekyll: patch for AsciiDoc examples Date: Wed, 31 Aug 2022 09:37:26 +0000 Message-Id: <20220831093727.282797-3-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220831093727.282797-1-hi@alyssa.is> References: <20220831093727.282797-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: UAONFRYQ4Y4MCM46JT5TPQGIYQIASFML X-Message-ID-Hash: UAONFRYQ4Y4MCM46JT5TPQGIYQIASFML X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= , Ivan Nikolaenko X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The documentation I would like to add for the build configuration file uses a titled example, which doesn't render nicely with Just The Docs without this change. Signed-off-by: Alyssa Ross --- Documentation/jekyll.nix | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/Documentation/jekyll.nix b/Documentation/jekyll.nix index 6f2866f..16c2c38 100644 --- a/Documentation/jekyll.nix +++ b/Documentation/jekyll.nix @@ -3,11 +3,39 @@ { config ? import ../nix/eval-config.nix {} }: config.pkgs.callPackage ( -{ bundlerApp }: +{ lib, bundlerApp, defaultGemConfig, fetchFromGitHub, fetchpatch }: bundlerApp { pname = "jekyll"; gemdir = ./.; exes = [ "jekyll" ]; + + gemConfig = defaultGemConfig // { + # We override Just the Docs to improve AsciiDoc support. + just-the-docs = attrs: + let super = defaultGemConfig.just-the-docs or (lib.const {}) attrs; in + super // { + # The gem tarball doesn't contain e.g. the SCSS files. + src = fetchFromGitHub { + owner = "just-the-docs"; + repo = "just-the-docs"; + rev ="v${attrs.version}"; + sha256 = assert attrs.version == "0.4.0.rc1"; "sUgwPio5Lukd8c0dR5kbRxW5vT/ctO69lbyg+AvcUbQ="; + }; + + patches = super.patches or attrs.patches or [] ++ [ + # https://github.com/just-the-docs/just-the-docs/pull/944 + (fetchpatch { + url = "https://github.com/alyssais/just-the-docs/commit/6bf1f26ab70b6a12fd090b99cda85f557da837eb.patch"; + sha256 = "jv3I7Unu6ZMl0hjvBlvTWIVH8cYfO3cVS1BoJnYWo+U="; + }) + ]; + + postPatch = '' + substituteInPlace just-the-docs.gemspec \ + --replace 'git ls-files -z' 'find * -print0' + ''; + }; + }; } ) { } -- 2.37.1