From 5d81e7cc681b8e3cb9cbbd6dbd4039bc2140e41f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 4 Mar 2025 19:33:22 +0100 Subject: [PATCH] vscode-extensions.asciidoctor.asciidoctor-vscode: 2.8.9 -> 3.4.2 About the postPatch snippet: The 'asciidoctor' program is no longer used for previews, instead the extension uses https://docs.asciidoctor.org/asciidoctor.js (which is bundled with the extension). See upstream: https://github.com/asciidoctor/asciidoctor-vscode/issues/443 ("Remove Asciidoctor CLI option for preview rendering"). --- .../commands-abspath.patch | 13 +++++++++++++ .../asciidoctor.asciidoctor-vscode/default.nix | 17 +++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/commands-abspath.patch diff --git a/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/commands-abspath.patch b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/commands-abspath.patch new file mode 100644 index 000000000000..fc3b7fd177eb --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/commands-abspath.patch @@ -0,0 +1,13 @@ +diff --git a/package.json b/package.json +index 7ab70e8..2ebe541 100644 +--- a/package.json ++++ b/package.json +@@ -437,7 +437,7 @@ + }, + "asciidoc.asciidoctorpdf_command": { + "type": "string", +- "default": "asciidoctor-pdf", ++ "default": "@ASCIIDOCTOR_PDF_BIN@", + "markdownDescription": "%asciidoc.asciidoctorpdf_command.desc%", + "markdownDeprecationMessage": "%asciidoc.asciidoctorpdf_command.deprecationMessage%", + "scope": "resource" diff --git a/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix index 7ab6bb7ce0c6..3f7dabf2e256 100644 --- a/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix @@ -8,17 +8,18 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "asciidoctor-vscode"; publisher = "asciidoctor"; - version = "2.8.9"; - sha256 = "1xkxx5i3nhd0dzqhhdmx0li5jifsgfhv0p5h7xwsscz3gzgsdcyb"; + version = "3.4.2"; + hash = "sha256-HG3y7999xeE1erQZCnBgUPj/aC0Kwyn20PEZR9gKrxY="; }; + patches = [ + ./commands-abspath.patch + ]; + postPatch = '' - substituteInPlace dist/src/text-parser.js \ - --replace "get('asciidoctor_command', 'asciidoctor')" \ - "get('asciidoctor_command', '${asciidoctor}/bin/asciidoctor')" - substituteInPlace dist/src/commands/exportAsPDF.js \ - --replace "get('asciidoctorpdf_command', 'asciidoctor-pdf')" \ - "get('asciidoctorpdf_command', '${asciidoctor}/bin/asciidoctor-pdf')" + substituteInPlace package.json \ + --replace-fail "@ASCIIDOCTOR_PDF_BIN@" \ + "${asciidoctor}/bin/asciidoctor-pdf" ''; meta = {