From 5dfa2d6f55793aa9a2b397a4215e1e4e9037c934 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 24 Dec 2024 00:09:17 +0100
Subject: [PATCH] pandoc_3_6: init at 3.6

pandoc_3_5: remove at 3.5
---
 .../haskell-modules/configuration-common.nix         | 12 ++++++------
 pkgs/development/libraries/quarto/default.nix        |  4 ++--
 pkgs/top-level/all-packages.nix                      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0217f2e82a96..24196f1fcd60 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1966,18 +1966,18 @@ self: super: {
 
   # Pandoc 3.5 improves the quality of PDF rendering in Quarto >=1.6.30.
   # https://github.com/NixOS/nixpkgs/pull/349683
-  pandoc-cli_3_5 = super.pandoc-cli_3_5.overrideScope (
+  pandoc-cli_3_6 = super.pandoc-cli_3_6.overrideScope (
     self: super: {
       doclayout = self.doclayout_0_5;
       hslua-module-doclayout = self.hslua-module-doclayout_1_2_0;
       lpeg = self.lpeg_1_1_0;
-      pandoc = self.pandoc_3_5;
-      pandoc-lua-engine = self.pandoc-lua-engine_0_3_3;
-      pandoc-server = self.pandoc-server_0_1_0_9;
-      texmath = self.texmath_0_12_8_11;
+      pandoc = self.pandoc_3_6;
+      pandoc-lua-engine = self.pandoc-lua-engine_0_4;
+      pandoc-server = self.pandoc-server_0_1_0_10;
+      texmath = self.texmath_0_12_8_12;
       tls = self.tls_2_0_6;
       toml-parser = self.toml-parser_2_0_1_0;
-      typst = self.typst_0_6;
+      typst = self.typst_0_6_1;
       typst-symbols = self.typst-symbols_0_1_6;
     }
   );
diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix
index 80f70bb7669a..9acf84229207 100644
--- a/pkgs/development/libraries/quarto/default.nix
+++ b/pkgs/development/libraries/quarto/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , lib
-, pandoc_3_5
+, pandoc_3_6
 , typst
 , esbuild
 , deno
@@ -38,7 +38,7 @@ stdenv.mkDerivation (final: {
   preFixup = ''
     wrapProgram $out/bin/quarto \
       --prefix QUARTO_DENO : ${lib.getExe deno} \
-      --prefix QUARTO_PANDOC : ${lib.getExe pandoc_3_5} \
+      --prefix QUARTO_PANDOC : ${lib.getExe pandoc_3_6} \
       --prefix QUARTO_ESBUILD : ${lib.getExe esbuild} \
       --prefix QUARTO_DART_SASS : ${lib.getExe dart-sass} \
       --prefix QUARTO_TYPST : ${lib.getExe typst} \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd073247696a..af9a3f256ed8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4709,7 +4709,7 @@ with pkgs;
 
   pakcs = callPackage ../development/compilers/pakcs { };
 
-  pandoc_3_5 = callPackage ../by-name/pa/pandoc/package.nix { selectPandocCLI = (p: p.pandoc-cli_3_5); };
+  pandoc_3_6 = callPackage ../by-name/pa/pandoc/package.nix { selectPandocCLI = (p: p.pandoc-cli_3_6); };
 
   paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { };